From 2eb3159f8a585e05767fbe71f3bfaac7684de5b9 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Fri, 18 May 2018 17:06:28 -0400
Subject: [PATCH 01/25] Disable merge when database is locked

---
 src/gui/DatabaseTabWidget.cpp | 13 ++++++++-----
 src/gui/MainWindow.cpp        |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index b3963f7b1c..a171a938dd 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -198,11 +198,14 @@ void DatabaseTabWidget::importCsv()
 
 void DatabaseTabWidget::mergeDatabase()
 {
-    QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
-    const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
-                                                       filter);
-    if (!fileName.isEmpty()) {
-        mergeDatabase(fileName);
+    auto dbWidget = currentDatabaseWidget();
+    if (dbWidget && dbWidget->currentMode() != DatabaseWidget::LockedMode) {
+        QString filter = QString("%1 (*.kdbx);;%2 (*)").arg(tr("KeePass 2 Database"), tr("All files"));
+        const QString fileName = fileDialog()->getOpenFileName(this, tr("Merge database"), QString(),
+                                                               filter);
+        if (!fileName.isEmpty()) {
+            mergeDatabase(fileName);
+        }
     }
 }
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 2e87b4d8c5..1299f3c4d6 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -647,7 +647,6 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
     m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
     m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
     m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
-    m_ui->actionDatabaseMerge->setEnabled(inDatabaseTabWidget);
     m_ui->actionRepairDatabase->setEnabled(inDatabaseTabWidgetOrWelcomeWidget);
 
     m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases());

From b16447b13d1d471a1f6351edcd346ee5a09bfc01 Mon Sep 17 00:00:00 2001
From: Jonathan White <droidmonkey@users.noreply.github.com>
Date: Sun, 20 May 2018 21:12:06 -0400
Subject: [PATCH 02/25] Fix occasional crash when favicon progress dialog is
 closed (#1980)

* Changed progress dialog to a true percentage calculation
* Removed some unnecessary code
---
 src/gui/EditWidgetIcons.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 837d6ef5c6..b13c8ba37a 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -45,16 +45,13 @@ UrlFetchProgressDialog::UrlFetchProgressDialog(const QUrl &url, QWidget *parent)
     setWindowTitle(tr("Download Progress"));
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setLabelText(tr("Downloading %1.").arg(url.toDisplayString()));
-    setMinimum(0);
-    setValue(0);
-    setMinimumDuration(0);
+    setMinimumDuration(2000);
     setMinimumSize(QSize(400, 75));
 }
 
 void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes)
 {
-    setMaximum(totalBytes);
-    setValue(bytesRead);
+    setValue(static_cast<int>(bytesRead / totalBytes));
 }
 
 EditWidgetIcons::EditWidgetIcons(QWidget* parent)
@@ -280,7 +277,9 @@ void EditWidgetIcons::fetchFinished()
 void EditWidgetIcons::fetchCanceled()
 {
 #ifdef WITH_XC_NETWORKING
-    m_reply->abort();
+    if (m_reply) {
+        m_reply->abort();
+    }
 #endif
 }
 

From e825b55a990c9d52ef5d9111b78d62d072118d41 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Thu, 24 May 2018 17:49:54 +0300
Subject: [PATCH 03/25] Fix entry sorting by title

---
 src/browser/BrowserService.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index af35315a0f..7d3293bd95 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -543,7 +543,9 @@ QList<Entry*> BrowserService::sortEntries(QList<Entry*>& pwEntries, const QStrin
             // Sort same priority entries by Title or UserName
             auto entries = priorities.values(i);
             std::sort(entries.begin(), entries.end(), [&priorities, &field](Entry* left, Entry* right) {
-                return QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) < 0;
+                return (QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) < 0) ||
+                       ((QString::localeAwareCompare(left->attributes()->value(field), right->attributes()->value(field)) == 0) && 
+                        (QString::localeAwareCompare(left->attributes()->value("UserName"), right->attributes()->value("UserName")) < 0));
             });
             results << entries;
             if (BrowserSettings::bestMatchOnly() && !pwEntries.isEmpty()) {

From fc8e0e7b19225ab398760e9d7cfa03a453456576 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sat, 16 Jun 2018 08:44:08 +0300
Subject: [PATCH 04/25] Remove title matching

---
 src/browser/BrowserService.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 7d3293bd95..956eaf0b77 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -375,14 +375,11 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
     }
 
     for (Entry* entry : EntrySearcher().search(hostname, rootGroup, Qt::CaseInsensitive)) {
-        QString title = entry->title();
         QString url = entry->url();
 
-        // Filter to match hostname in Title and Url fields
-        if ((!title.isEmpty() && hostname.contains(title))
-            || (!url.isEmpty() && hostname.contains(url))
-            || (matchUrlScheme(title) && hostname.endsWith(QUrl(title).host()))
-            || (matchUrlScheme(url) && hostname.endsWith(QUrl(url).host())) ) {
+        // Filter to match hostname in URL field
+        if ((!url.isEmpty() && hostname.contains(url))
+            || (matchUrlScheme(url) && hostname.endsWith(QUrl(url).host()))) {
                 entries.append(entry);
         }
     }

From 0ad598119f14a101790ed42b1670f7c93b9e3bf4 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sat, 16 Jun 2018 08:14:53 +0300
Subject: [PATCH 05/25] Fix macOS build

---
 src/gui/entry/EditEntryWidget.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index 9b2a919c69..06ede09cdf 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -21,6 +21,7 @@
 
 #include <QModelIndex>
 #include <QScopedPointer>
+#include <QButtonGroup>
 
 #include "gui/EditWidget.h"
 #include "config-keepassx.h"

From 9805f2331d9e94ab438330f23cd8a4d9abca0172 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 18 Jun 2018 23:34:30 -0400
Subject: [PATCH 06/25] Add support for SonarCloud analysis

---
 .gitignore               |  3 ++-
 cmake/CodeCoverage.cmake |  4 ++++
 sonar-project.properties | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 sonar-project.properties

diff --git a/.gitignore b/.gitignore
index c96688e9ff..903910a37e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ release*/
 *.swp
 
 .DS_Store
-.version
\ No newline at end of file
+.version
+\.scannerwork/
diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
index a0b0ef5269..d10f79723a 100644
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -131,6 +131,10 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 	ENDIF() # NOT GENHTML_PATH
 
 	SET(coverage_info "${CMAKE_BINARY_DIR}/${_outputname}.info")
+	IF(MINGW)
+		# Replace C:/ with /C for MINGW
+		STRING(REGEX REPLACE "^([a-zA-Z]):" "/\\1" coverage_info ${coverage_info})
+	ENDIF()
 	SET(coverage_cleaned "${coverage_info}.cleaned")
 
 	SEPARATE_ARGUMENTS(test_command UNIX_COMMAND "${_testrunner}")
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..0ba2bee8f2
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,18 @@
+# https://about.sonarcloud.io/get-started/ 
+# Run the SonarCloud tools with the follow parameters:
+# Run in the cmake build directory after cmake: build-wrapper-[platform]-x86-64 --out-dir bw-output make clean all
+# Run in the project root directory: sonar-scanner.bat -Dsonar.cfamily.build-wrapper-output=build/bw-output -Dsonar.cfamily.gcov.reportsPath=build -Dsonar.login=[AUTH_TOKEN]
+
+# required metadata
+sonar.projectKey=keepassxc
+sonar.organization=droidmonkey-github
+sonar.projectName=keepassxc
+sonar.host.url=https://sonarcloud.io
+  
+# path to source directories (required)
+sonar.sources=src
+sonar.tests=tests
+
+sonar.cfamily.threads=2
+
+sonar.exclusions=**/zxcvbn/*

From 8c70856a82850a204aa01acbcff48c8e79006d4b Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Sun, 20 May 2018 09:49:47 +0300
Subject: [PATCH 07/25] SSH Agent: Fix invalid iqmp output for RSA keys

This fixes loading RSA keys to Pageant.
---
 src/sshagent/ASN1Key.cpp |  6 +--
 tests/TestOpenSSHKey.cpp | 83 ++++++++++++++++++++++++++++++++++++++++
 tests/TestOpenSSHKey.h   |  1 +
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/src/sshagent/ASN1Key.cpp b/src/sshagent/ASN1Key.cpp
index c46b8fa0bb..2b6cbd1065 100644
--- a/src/sshagent/ASN1Key.cpp
+++ b/src/sshagent/ASN1Key.cpp
@@ -102,14 +102,14 @@ namespace {
 
         mpi_invm(u, q, p);
 
-        iqmp_hex.resize((bap.length() + 1) * 2);
-        gcry_mpi_print(GCRYMPI_FMT_HEX, reinterpret_cast<unsigned char*>(iqmp_hex.data()), iqmp_hex.length(), nullptr, u);
+        iqmp_hex.resize(bap.length() * 2);
+        gcry_mpi_print(GCRYMPI_FMT_HEX, reinterpret_cast<unsigned char*>(iqmp_hex.data()), iqmp_hex.size(), nullptr, u);
 
         gcry_mpi_release(u);
         gcry_mpi_release(p);
         gcry_mpi_release(q);
 
-        return QByteArray::fromHex(iqmp_hex);
+        return QByteArray::fromHex(QString(iqmp_hex).toLatin1());
     }
 }
 
diff --git a/tests/TestOpenSSHKey.cpp b/tests/TestOpenSSHKey.cpp
index 3f91ab4df5..8e226750cf 100644
--- a/tests/TestOpenSSHKey.cpp
+++ b/tests/TestOpenSSHKey.cpp
@@ -181,6 +181,89 @@ void TestOpenSSHKey::testParseRSA()
     QCOMPARE(key.fingerprint(), QString("SHA256:DYdaZciYNxCejr+/8x+OKYxeTU1D5UsuIFUG4PWRFkk"));
 }
 
+void TestOpenSSHKey::testParseRSACompare()
+{
+    const QString oldKeyString = QString(
+        "-----BEGIN RSA PRIVATE KEY-----\n"
+        "MIIEpAIBAAKCAQEAsCHtJicDPWnvHSIKbnTZaJkIB9vgE0pmLdK580JUqBuonVbB\n"
+        "y1QTy0ZQ7/TtqvLPgwPK88TR46OLO/QGCzo2+XxgJ85uy0xfuyUYRmSuw0drsErN\n"
+        "mH8vU91lSBxsGDp9LtBbgHKoR23vMWZ34IxFRc55XphrIH48ijsMaL6bXBwF/3tD\n"
+        "9T3lm2MpP1huyVNnIY9+GRRWCy4f9LMj/UGu/n4RtwwfpOZBBRwYkq5QkzA9lPm/\n"
+        "VzF3MP1rKTMkvAw+Nfb383mkmc6MRnsa6uh6iDa9aVB7naegM13UJQX/PY1Ks6pO\n"
+        "XDpy/MQ7iCh+HmYNq5dRmARyaNl9xIXJNhz1cQIDAQABAoIBAQCnEUc1LUQxeM5K\n"
+        "wANNCqE+SgoIClPdeHC7fmrLh1ttqe6ib6ybBUFRS31yXs0hnfefunVEDKlaV8K2\n"
+        "N52UAMAsngFHQNRvGh6kEWeZPd9Xc+N98TZbNCjcT+DGKc+Om8wqH5DrodZlCq4c\n"
+        "GaoT4HnE4TjWtZTH2XXrWF9I66PKFWf070R44nvyVcvaZi4pC2YmURRPuGF6K1iK\n"
+        "dH8zM6HHG1UGu2W6hLNn+K01IulG0Lb8eWNaNYMmtQWaxyp7I2IWkkecUs3nCuiR\n"
+        "byFOoomCjdh8r9yZFvwxjGUhgtkALN9GCU0Mwve+s11IB2gevruN+q9/Qejbyfdm\n"
+        "IlgLAeTRAoGBANRcVzW9CYeobCf+U9hKJFEOur8XO+J2mTMaELA0EjWpTJFAeIT7\n"
+        "KeRpCRG4/vOSklxxRF6vP1EACA4Z+5BlN+FTipHHs+bSEgqkPZiiANDH7Zot5Iqv\n"
+        "1q0fRyldNRZNZK7DWp08BPNVWGA/EnEuKJiURxnxBaxNXbUyMCdjxvMvAoGBANRT\n"
+        "utbrqS/bAa/DcHKn3V6DRqBl3TDOfvCNjiKC84a67F2uXgzLIdMktr4d1NyCZVJd\n"
+        "7/zVgWORLIdg1eAi6rYGoOvNV39wwga7CF+m9sBY0wAaKYCELe6L26r4aQHVCX6n\n"
+        "rnIgUv+4o4itmU2iP0r3wlmDC9pDRQP82vfvQPlfAoGASwhleANW/quvq2HdViq8\n"
+        "Mje2HBalfhrRfpDTHK8JUBSFjTzuWG42GxJRtgVbb8x2ElujAKGDCaetMO5VSGu7\n"
+        "Fs5hw6iAFCpdXY0yhl+XUi2R8kwM2EPQ4lKO3jqkq0ClNmqn9a5jQWcCVt9yMLNS\n"
+        "fLbHeI8EpiCf34ngIcrLXNkCgYEAzlcEZuKkC46xB+dNew8pMTUwSKZVm53BfPKD\n"
+        "44QRN6imFbBjU9mAaJnwQbfp6dWKs834cGPolyM4++MeVfB42iZ88ksesgmZdUMD\n"
+        "szkl6O0pOJs0I+HQZVdjRbadDZvD22MHQ3+oST1dJ3FVXz3Cdo9qPuT8esMO6f4r\n"
+        "qfDH2s8CgYAXC/lWWHQ//PGP0pH4oiEXisx1K0X1u0xMGgrChxBRGRiKZUwNMIvJ\n"
+        "TqUu7IKizK19cLHF/NBvxHYHFw+m7puNjn6T1RtRCUjRZT7Dx1VHfVosL9ih5DA8\n"
+        "tpbZA5KGKcvHtB5DDgT0MHwzBZnb4Q//Rhovzn+HXZPsJTTgHHy3NQ==\n"
+        "-----END RSA PRIVATE KEY-----\n"
+    );
+
+    const QString newKeyString = QString(
+        "-----BEGIN OPENSSH PRIVATE KEY-----\n"
+        "b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn\n"
+        "NhAAAAAwEAAQAAAQEAsCHtJicDPWnvHSIKbnTZaJkIB9vgE0pmLdK580JUqBuonVbBy1QT\n"
+        "y0ZQ7/TtqvLPgwPK88TR46OLO/QGCzo2+XxgJ85uy0xfuyUYRmSuw0drsErNmH8vU91lSB\n"
+        "xsGDp9LtBbgHKoR23vMWZ34IxFRc55XphrIH48ijsMaL6bXBwF/3tD9T3lm2MpP1huyVNn\n"
+        "IY9+GRRWCy4f9LMj/UGu/n4RtwwfpOZBBRwYkq5QkzA9lPm/VzF3MP1rKTMkvAw+Nfb383\n"
+        "mkmc6MRnsa6uh6iDa9aVB7naegM13UJQX/PY1Ks6pOXDpy/MQ7iCh+HmYNq5dRmARyaNl9\n"
+        "xIXJNhz1cQAAA8DLsKINy7CiDQAAAAdzc2gtcnNhAAABAQCwIe0mJwM9ae8dIgpudNlomQ\n"
+        "gH2+ATSmYt0rnzQlSoG6idVsHLVBPLRlDv9O2q8s+DA8rzxNHjo4s79AYLOjb5fGAnzm7L\n"
+        "TF+7JRhGZK7DR2uwSs2Yfy9T3WVIHGwYOn0u0FuAcqhHbe8xZnfgjEVFznlemGsgfjyKOw\n"
+        "xovptcHAX/e0P1PeWbYyk/WG7JU2chj34ZFFYLLh/0syP9Qa7+fhG3DB+k5kEFHBiSrlCT\n"
+        "MD2U+b9XMXcw/WspMyS8DD419vfzeaSZzoxGexrq6HqINr1pUHudp6AzXdQlBf89jUqzqk\n"
+        "5cOnL8xDuIKH4eZg2rl1GYBHJo2X3Ehck2HPVxAAAAAwEAAQAAAQEApxFHNS1EMXjOSsAD\n"
+        "TQqhPkoKCApT3Xhwu35qy4dbbanuom+smwVBUUt9cl7NIZ33n7p1RAypWlfCtjedlADALJ\n"
+        "4BR0DUbxoepBFnmT3fV3PjffE2WzQo3E/gxinPjpvMKh+Q66HWZQquHBmqE+B5xOE41rWU\n"
+        "x9l161hfSOujyhVn9O9EeOJ78lXL2mYuKQtmJlEUT7hheitYinR/MzOhxxtVBrtluoSzZ/\n"
+        "itNSLpRtC2/HljWjWDJrUFmscqeyNiFpJHnFLN5wrokW8hTqKJgo3YfK/cmRb8MYxlIYLZ\n"
+        "ACzfRglNDML3vrNdSAdoHr67jfqvf0Ho28n3ZiJYCwHk0QAAAIAXC/lWWHQ//PGP0pH4oi\n"
+        "EXisx1K0X1u0xMGgrChxBRGRiKZUwNMIvJTqUu7IKizK19cLHF/NBvxHYHFw+m7puNjn6T\n"
+        "1RtRCUjRZT7Dx1VHfVosL9ih5DA8tpbZA5KGKcvHtB5DDgT0MHwzBZnb4Q//Rhovzn+HXZ\n"
+        "PsJTTgHHy3NQAAAIEA1FxXNb0Jh6hsJ/5T2EokUQ66vxc74naZMxoQsDQSNalMkUB4hPsp\n"
+        "5GkJEbj+85KSXHFEXq8/UQAIDhn7kGU34VOKkcez5tISCqQ9mKIA0Mftmi3kiq/WrR9HKV\n"
+        "01Fk1krsNanTwE81VYYD8ScS4omJRHGfEFrE1dtTIwJ2PG8y8AAACBANRTutbrqS/bAa/D\n"
+        "cHKn3V6DRqBl3TDOfvCNjiKC84a67F2uXgzLIdMktr4d1NyCZVJd7/zVgWORLIdg1eAi6r\n"
+        "YGoOvNV39wwga7CF+m9sBY0wAaKYCELe6L26r4aQHVCX6nrnIgUv+4o4itmU2iP0r3wlmD\n"
+        "C9pDRQP82vfvQPlfAAAABmlkX3JzYQECAwQ=\n"
+        "-----END OPENSSH PRIVATE KEY-----\n"
+    );
+
+    const QByteArray oldKeyData = oldKeyString.toLatin1();
+    const QByteArray newKeyData = newKeyString.toLatin1();
+
+    OpenSSHKey newKey, oldKey;
+    QByteArray oldPrivateKey, newPrivateKey;
+    BinaryStream oldPrivateStream(&oldPrivateKey), newPrivateStream(&newPrivateKey);
+
+    QVERIFY(oldKey.parse(oldKeyData));
+    QVERIFY(newKey.parse(newKeyData));
+
+    // comment is not part of the old format and writePrivate() includes it
+    oldKey.setComment("id_rsa");
+
+    QVERIFY(oldKey.writePrivate(oldPrivateStream));
+    QVERIFY(newKey.writePrivate(newPrivateStream));
+
+    QCOMPARE(oldKey.type(), newKey.type());
+    QCOMPARE(oldKey.fingerprint(), newKey.fingerprint());
+    QCOMPARE(oldPrivateKey, newPrivateKey);
+}
+
 void TestOpenSSHKey::testDecryptOpenSSHAES256CBC()
 {
     const QString keyString = QString(
diff --git a/tests/TestOpenSSHKey.h b/tests/TestOpenSSHKey.h
index 2d791dee84..77ca270d0e 100644
--- a/tests/TestOpenSSHKey.h
+++ b/tests/TestOpenSSHKey.h
@@ -31,6 +31,7 @@ private slots:
     void testParse();
     void testParseDSA();
     void testParseRSA();
+    void testParseRSACompare();
     void testDecryptRSAAES128CBC();
     void testDecryptOpenSSHAES256CBC();
     void testDecryptRSAAES256CBC();

From a025bcd7db2b4ff456ce0cd9def55fc6184f240b Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 8 Jul 2018 11:41:00 -0400
Subject: [PATCH 08/25] Build snaps using custom Docker image

* Added --snapcraft option to release-tool build command
---
 ci/snapcraft/Dockerfile | 51 +++++++++++++++++++++++++++++++++++++++++
 release-tool            | 51 ++++++++++++++++++++++++++++-------------
 snapcraft.yaml          | 34 +++++++++++++--------------
 3 files changed, 102 insertions(+), 34 deletions(-)
 create mode 100644 ci/snapcraft/Dockerfile

diff --git a/ci/snapcraft/Dockerfile b/ci/snapcraft/Dockerfile
new file mode 100644
index 0000000000..37b3742dda
--- /dev/null
+++ b/ci/snapcraft/Dockerfile
@@ -0,0 +1,51 @@
+# KeePassXC Linux Release Build Dockerfile
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 or (at your option)
+# version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+FROM snapcore/snapcraft
+
+ENV REBUILD_COUNTER=1
+
+ENV QT5_VERSION=510
+ENV QT5_PPA_VERSION=5.10.1
+
+RUN set -x \
+    && apt update -y \
+    && apt -y install software-properties-common
+
+RUN set -x \
+    && add-apt-repository ppa:phoerious/keepassxc
+
+RUN set -x \
+    && apt update -y \
+    && apt-get -y --no-install-recommends install \
+      build-essential \
+      cmake \
+      libgcrypt20-18-dev \
+      libargon2-0-dev \
+      libsodium-dev \
+      qtbase5-dev \
+      qttools5-dev \
+      qttools5-dev-tools \
+      zlib1g-dev \
+      libyubikey-dev \
+      libykpers-1-dev \
+      libxi-dev \
+      libxtst-dev \
+      xvfb
+
+RUN set -x \
+    && apt-get autoremove --purge
+
diff --git a/release-tool b/release-tool
index 74f2059008..f2a7b8116a 100755
--- a/release-tool
+++ b/release-tool
@@ -41,6 +41,7 @@ BUILD_PLUGINS="all"
 INSTALL_PREFIX="/usr/local"
 BUILD_SOURCE_TARBALL=true
 BUILD_SNAPSHOT=false
+BUILD_SNAPCRAFT=false
 ORIG_BRANCH=""
 ORIG_CWD="$(pwd)"
 
@@ -106,6 +107,8 @@ Options:
                           This option has no effect if --build is not set.
       --container-name    Docker container name (default: '${DOCKER_CONTAINER_NAME}')
                           The container must not exist already
+      --snapcraft         Create and use docker image to build snapcraft distribution.
+                          This option has no effect if --docker-image is not set.
   -c, --cmake-options     Additional CMake options for compiling the sources
       --compiler          Compiler to use (default: '${COMPILER}')
   -m, --make-options      Make options for compiling sources (default: '${MAKE_OPTIONS}')
@@ -542,6 +545,10 @@ build() {
             --container-name)
                 DOCKER_CONTAINER_NAME="$2"
                 shift ;;
+                
+            --snapcraft)
+                BUILD_SNAPCRAFT=true
+                shift ;;
             
             -c|--cmake-options)
                 CMAKE_OPTIONS="$2"
@@ -703,22 +710,34 @@ build() {
             ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
         fi
     else
-        mkdir -p "${OUTPUT_DIR}/bin-release"
-        
-        logInfo "Launching Docker container to compile sources..."
-        
-        docker run --name "$DOCKER_CONTAINER_NAME" --rm \
-            --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
-            -e "CC=${CC}" -e "CXX=${CXX}" \
-            -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
-            -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
-            "$DOCKER_IMAGE" \
-            bash -c "cd /keepassxc/out/build-release && \
-                cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-                    -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" \
-                    -DKEEPASSXC_DIST_TYPE=AppImage /keepassxc/src && \
-                make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
-                /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
+        if [ BUILD_SNAPCRAFT ]; then
+            logInfo "Building snapcraft docker image..."
+            
+            sudo docker image build -t "$DOCKER_IMAGE" "$(realpath "$SRC_DIR")/ci/snapcraft"
+
+            logInfo "Launching Docker contain to compile snapcraft..."
+            
+            sudo docker run --name "$DOCKER_CONTAINER_NAME" --rm \
+                -v "$(realpath "$SRC_DIR"):/keepassxc" -w "/keepassxc" \
+                "$DOCKER_IMAGE" snapcraft       
+        else
+            mkdir -p "${OUTPUT_DIR}/bin-release"
+            
+            logInfo "Launching Docker container to compile sources..."
+            
+            docker run --name "$DOCKER_CONTAINER_NAME" --rm \
+                --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
+                -e "CC=${CC}" -e "CXX=${CXX}" \
+                -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
+                -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
+                "$DOCKER_IMAGE" \
+                bash -c "cd /keepassxc/out/build-release && \
+                    cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
+                        -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" \
+                        -DKEEPASSXC_DIST_TYPE=AppImage /keepassxc/src && \
+                    make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
+                    /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
+        fi
         
         if [ 0 -ne $? ]; then
             exitError "Docker build failed!"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 5a3597c301..83f003aeaa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -27,6 +27,8 @@ parts:
     configflags:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_LIBRARY_PATH=/opt/keepassxc-libs/lib/x86_64-linux-gnu
+      - -DCMAKE_INCLUDE_PATH=/opt/keepassxc-libs/include
       - -DKEEPASSXC_DIST_TYPE=Snap
       - -DKEEPASSXC_BUILD_TYPE=Release
       - -DWITH_TESTS=OFF
@@ -43,29 +45,25 @@ parts:
       - libxtst-dev
       - libyubikey-dev
       - libykpers-1-dev
-      - libcurl4-openssl-dev
       - libsodium-dev
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations
-    install: |
+      - libgcrypt20-18
+      - libykpers-1-1
+      - libargon2-0
+      - libsodium23
+      - libxtst6
+      - libqt5x11extras5
+      - libusb-1.0-0
+    override-build: |
+      snapcraftctl build
       sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.KeePassXC.desktop
     organize:
       usr/share/qt5/translations/*.qm: usr/share/keepassxc/translations/
+      opt/keepassxc-libs/lib/x86_64-linux-gnu/*: usr/lib/x86_64-linux-gnu/
+      opt/keepassxc-libs/share/locale/*: usr/share/locale/
+    stage:
+      - -opt
     after: [desktop-qt5]
-
-  # Redefine desktop-qt5 stage packages to work with Ubuntu 17.04
-  desktop-qt5:
-    stage-packages:
-      - libxkbcommon0
-      - ttf-ubuntu-font-family
-      - dmz-cursor-theme
-      - light-themes
-      - adwaita-icon-theme
-      - gnome-themes-standard
-      - shared-mime-info
-      - libqt5gui5
-      - libgdk-pixbuf2.0-0
-      - libqt5svg5 # for loading icon themes which are svg
-      - locales-all
-      - xdg-user-dirs
+    

From 4b51b39a833b9390e164a02ac69420cbfb58ff40 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 8 Jul 2018 19:47:35 -0400
Subject: [PATCH 09/25] Add exe signing support to release-tool

* Add automatic portable zip building
* Cleanup build variables
* Align command line parameters between modes
---
 release-tool       | 116 +++++++++++++++++++++++++++------------------
 src/CMakeLists.txt |   2 +-
 2 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/release-tool b/release-tool
index f2a7b8116a..121a5c8605 100755
--- a/release-tool
+++ b/release-tool
@@ -35,13 +35,11 @@ TAG_NAME=""
 DOCKER_IMAGE=""
 DOCKER_CONTAINER_NAME="keepassxc-build-container"
 CMAKE_OPTIONS=""
+CPACK_GENERATORS="NSIS;ZIP"
 COMPILER="g++"
 MAKE_OPTIONS="-j8"
 BUILD_PLUGINS="all"
 INSTALL_PREFIX="/usr/local"
-BUILD_SOURCE_TARBALL=true
-BUILD_SNAPSHOT=false
-BUILD_SNAPCRAFT=false
 ORIG_BRANCH=""
 ORIG_CWD="$(pwd)"
 
@@ -81,7 +79,7 @@ Options:
   -v, --version        Release version number or name (required)
   -a, --app-name       Application name (default: '${APP_NAME}')
   -s, --source-dir     Source directory (default: '${SRC_DIR}')
-  -g, --gpg-key        GPG key used to sign the merge commit and release tag,
+  -k, --key            GPG key used to sign the merge commit and release tag,
                        leave empty to let Git choose your default key
                        (default: '${GPG_GIT_KEY}')
   -r, --release-branch Source release branch to merge from (default: 'release/VERSION')
@@ -109,9 +107,12 @@ Options:
                           The container must not exist already
       --snapcraft         Create and use docker image to build snapcraft distribution.
                           This option has no effect if --docker-image is not set.
+      --appsign           Perform platform specific App Signing before packaging
+  -k, --key               Specify the App Signing Key/Identity
   -c, --cmake-options     Additional CMake options for compiling the sources
       --compiler          Compiler to use (default: '${COMPILER}')
   -m, --make-options      Make options for compiling sources (default: '${MAKE_OPTIONS}')
+  -g, --generators        Additional CPack generators (default: )
   -i, --install-prefix    Install prefix (default: '${INSTALL_PREFIX}')
   -p, --plugins           Space-separated list of plugins to build
                           (default: ${BUILD_PLUGINS})
@@ -126,7 +127,7 @@ Sign previously compiled release packages with GPG
 
 Options:
   -f, --files        Files to sign (required)
-  -g, --gpg-key      GPG key used to sign the files (default: '${GPG_KEY}')
+  -k, --key          GPG key used to sign the files (default: '${GPG_KEY}')
   -h, --help         Show this help
 EOF
     elif [ "appsign" == "$cmd" ]; then
@@ -136,8 +137,7 @@ Sign binaries with code signing certificates on Windows and macOS
 
 Options:
   -f, --files        Files to sign (required)
-  -k, --signtool-key Key to be used with signtool (required for Windows EXE)
-  -i, --identity     Apple Developer ID to be used with codesign (required for macOS APP and DMG)
+  -k, --key          Signing Key or Apple Developer ID
   -h, --help         Show this help
 EOF
     fi
@@ -437,7 +437,7 @@ merge() {
                 SRC_DIR="$2"
                 shift ;;
             
-            -g|--gpg-key)
+            -k|--key|-g|--gpg-key)
                 GPG_GIT_KEY="$2"
                 shift ;;
             
@@ -514,7 +514,14 @@ merge() {
 # -----------------------------------------------------------------------
 #                             build command
 # -----------------------------------------------------------------------
-build() {    
+build() {
+    local build_source_tarball=true
+    local build_snapshot=false
+    local build_snapcraft=false
+    local build_generators=""
+    local build_appsign=false
+    local build_key=""
+    
     while [ $# -ge 1 ]; do
         local arg="$1"
         case "$arg" in
@@ -541,14 +548,20 @@ build() {
             -d|--docker-image)
                 DOCKER_IMAGE="$2"
                 shift ;;
+
+            --appsign)
+                build_appsign=true ;;
+
+            -k|--key)
+                build_key="$2"
+                shift ;;
             
             --container-name)
                 DOCKER_CONTAINER_NAME="$2"
                 shift ;;
                 
             --snapcraft)
-                BUILD_SNAPCRAFT=true
-                shift ;;
+                build_snapcraft=true ;;
             
             -c|--cmake-options)
                 CMAKE_OPTIONS="$2"
@@ -561,6 +574,10 @@ build() {
             -m|--make-options)
                 MAKE_OPTIONS="$2"
                 shift ;;
+
+            -g|--generators)
+                buil_generators="$2"
+                shift ;;
             
             -i|--install-prefix)
                 INSTALL_PREFIX="$2"
@@ -571,10 +588,10 @@ build() {
                 shift ;;
             
             -n|--no-source-tarball)
-                BUILD_SOURCE_TARBALL=false ;;
+                build_source_tarball=false ;;
 
             --snapshot)
-                BUILD_SNAPSHOT=true ;;
+                build_snapshot=true ;;
             
             -h|--help)
                 printUsage "build"
@@ -592,7 +609,7 @@ build() {
 
     OUTPUT_DIR="$(realpath "$OUTPUT_DIR")"
 
-    if ${BUILD_SNAPSHOT}; then
+    if ${build_snapshot}; then
         TAG_NAME="HEAD"
         local branch=`git rev-parse --abbrev-ref HEAD`
         logInfo "Using current branch ${branch} to build..."
@@ -618,7 +635,7 @@ build() {
         exitError "Failed to create output directory!"
     fi
 
-    if ${BUILD_SOURCE_TARBALL}; then
+    if ${build_source_tarball}; then
         logInfo "Creating source tarball..."
         local app_name_lower="$(echo "$APP_NAME" | tr '[:upper:]' '[:lower:]')"
         local prefix="${app_name_lower}-${RELEASE_NAME}"
@@ -626,7 +643,7 @@ build() {
 
         git archive --format=tar "$TAG_NAME" --prefix="${prefix}/" --output="${OUTPUT_DIR}/${tarball_name}"
 
-        if ! ${BUILD_SNAPSHOT}; then
+        if ! ${build_snapshot}; then
             # add .version file to tar
             mkdir "${prefix}"
             echo -n ${RELEASE_NAME} > "${prefix}/.version"
@@ -638,7 +655,7 @@ build() {
         xz -6 "${OUTPUT_DIR}/${tarball_name}"
     fi
 
-    if ! ${BUILD_SNAPSHOT} && [ -e "${OUTPUT_DIR}/build-release" ]; then
+    if ! ${build_snapshot} && [ -e "${OUTPUT_DIR}/build-release" ]; then
         logInfo "Cleaning existing build directory..."
         rm -r "${OUTPUT_DIR}/build-release" 2> /dev/null
         if [ $? -ne 0 ]; then
@@ -681,22 +698,38 @@ build() {
             # Building on Windows with Msys2
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off -G"MSYS Makefiles" \
-                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" $CMAKE_OPTIONS "$SRC_DIR"
+                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" ${CMAKE_OPTIONS} "$SRC_DIR"
             
             logInfo "Compiling and packaging sources..."
             mingw32-make ${MAKE_OPTIONS} preinstall
+
+            # Appsign the executables if desired
+            if [[ ${build_appsign} && ! -z ${build_key} ]]; then
+                logInfo "Signing executable files"
+                appsign "-f" `find src | grep '\.exe'` "-k" "${build_key}"
+            fi
+
             # Call cpack directly instead of calling make package.
             # This is important because we want to build the MSI when making a
             # release.
-            cpack -G "NSIS;ZIP;${CPACK_GENERATORS}"
+            cpack -G "${CPACK_GENERATORS};${build_generators}"
+
+            # Inject the portable config into the zip build and rename
+            for filename in ${APP_NAME}-*.zip; do
+                logInfo "Creating portable zip file"
+                local folder=`echo ${filename} | sed -r 's/(.*)\.zip/\1/'`
+                python -c 'import zipfile,sys ; zipfile.ZipFile(sys.argv[1],"a").write(sys.argv[2],sys.argv[3])' \
+                    ${filename} ${SRC_DIR}/share/keepassxc.ini ${folder}/keepassxc.ini
+                mv ${filename} ${folder}-portable.zip
+            done
             
-            mv "./${APP_NAME}-"*.* ../
+            mv "${APP_NAME}-"*.* ../
         else
             mkdir -p "${OUTPUT_DIR}/bin-release"
             
             # Building on Linux without Docker container
             logInfo "Configuring build..."
-            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off ${CMAKE_OPTIONS} \
                 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
                 -DKEEPASSXC_DIST_TYPE=AppImage "$SRC_DIR"
                 
@@ -710,7 +743,7 @@ build() {
             ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
         fi
     else
-        if [ BUILD_SNAPCRAFT ]; then
+        if [ build_snapcraft ]; then
             logInfo "Building snapcraft docker image..."
             
             sudo docker image build -t "$DOCKER_IMAGE" "$(realpath "$SRC_DIR")/ci/snapcraft"
@@ -767,7 +800,7 @@ gpgsign() {
                     shift
                 done ;;
 
-            -g|--gpg-key)
+            -k|--key|-g|--gpg-key)
                 GPG_KEY="$2"
                 shift ;;
 
@@ -817,8 +850,7 @@ gpgsign() {
 # -----------------------------------------------------------------------
 appsign() {
     local sign_files=()
-    local signtool_key
-    local codesign_identity
+    local key
 
     while [ $# -ge 1 ]; do
         local arg="$1"
@@ -829,12 +861,8 @@ appsign() {
                     shift
                 done ;;
 
-            -k|--signtool-key)
-                signtool_key="$2"
-                shift ;;
-
-            -i|--identity)
-                codesign_identity="$2"
+            -k|--key|-i|--identity)
+                key="$2"
                 shift ;;
 
             -h|--help)
@@ -849,6 +877,12 @@ appsign() {
         shift
     done
 
+    if [ -z "${key}" ]; then
+        logError "Missing arguments, --key is required!\n"
+        printUsage "appsign"
+        exit 1
+    fi
+
     if [ -z "${sign_files}" ]; then
         logError "Missing arguments, --files is required!\n"
         printUsage "appsign"
@@ -862,12 +896,6 @@ appsign() {
     done
 
     if [ "$(uname -s)" == "Darwin" ]; then
-        if [ -z "${codesign_identity}" ]; then
-            logError "Missing arguments, --identity is required on macOS!\n"
-            printUsage "appsign"
-            exit 1
-        fi
-
         checkCodesignCommandExists
 
         local orig_dir="$(pwd)"
@@ -887,7 +915,7 @@ appsign() {
                 fi
 
                 logInfo "Signing app using codesign..."
-                codesign --sign "${codesign_identity}" --verbose --deep ./app/KeePassXC.app
+                codesign --sign "${key}" --verbose --deep ./app/KeePassXC.app
 
                 if [ 0 -ne $? ]; then
                     cd "${orig_dir}"
@@ -912,15 +940,9 @@ appsign() {
         done
 
     elif [ "$(uname -o)" == "Msys" ]; then
-        if [ -z "${signtool_key}" ]; then
-            logError "Missing arguments, --signtool-key is required on Windows!\n"
-            printUsage "appsign"
-            exit 1
-        fi
-
         checkOsslsigncodeCommandExists
 
-        if [[ ! -f "${signtool_key}" ]]; then
+        if [[ ! -f "${key}" ]]; then
             exitError "Key file was not found!"
         fi
 
@@ -931,7 +953,7 @@ appsign() {
             if [[ ${f: -4} == ".exe" ]]; then
                 logInfo "Signing file '${f}' using osslsigncode..."
                 # output a signed exe; we have to use a different name due to osslsigntool limitations
-                osslsigncode sign -pkcs12 "${signtool_key}" -pass "${password}" -n "KeePassXC" \
+                osslsigncode sign -pkcs12 "${key}" -pass "${password}" -n "KeePassXC" \
                     -t "http://timestamp.comodoca.com/authenticode" -in "${f}" -out "${f}.signed"
 
                 if [ 0 -ne $? ]; then
@@ -947,7 +969,7 @@ appsign() {
 
                 # osslsigncode does not succeed at signing MSI files at this time...
                 logInfo "Signing file '${f}' using Microsoft signtool..."
-                signtool sign -f "${signtool_key}" -p "${password}" -d "KeePassXC" \
+                signtool sign -f "${key}" -p "${password}" -d "KeePassXC" \
                     -t "http://timestamp.comodoca.com/authenticode" "${f}"
                 
                 if [ 0 -ne $? ]; then
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61f444e513..28a0753e92 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -345,7 +345,7 @@ if(MINGW)
   string(REGEX REPLACE "-snapshot$" "" KEEPASSXC_VERSION_CLEAN ${KEEPASSXC_VERSION})
 
   set(CPACK_GENERATOR "ZIP;NSIS")
-  set(CPACK_STRIP_FILES ON)
+  set(CPACK_STRIP_FILES OFF)
   set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}-${OUTPUT_FILE_POSTFIX}")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROGNAME})
   set(CPACK_PACKAGE_VERSION ${KEEPASSXC_VERSION_CLEAN})

From ded0aab5866219bee27db725ddf27b585adc4c83 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 10 Jul 2018 21:43:01 -0400
Subject: [PATCH 10/25] Fix typos in release tool

---
 release-tool | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-tool b/release-tool
index 121a5c8605..5dfdad4348 100755
--- a/release-tool
+++ b/release-tool
@@ -112,7 +112,7 @@ Options:
   -c, --cmake-options     Additional CMake options for compiling the sources
       --compiler          Compiler to use (default: '${COMPILER}')
   -m, --make-options      Make options for compiling sources (default: '${MAKE_OPTIONS}')
-  -g, --generators        Additional CPack generators (default: )
+  -g, --generators        Additional CPack generators (default: '${CPACK_GENERATORS}')
   -i, --install-prefix    Install prefix (default: '${INSTALL_PREFIX}')
   -p, --plugins           Space-separated list of plugins to build
                           (default: ${BUILD_PLUGINS})
@@ -576,7 +576,7 @@ build() {
                 shift ;;
 
             -g|--generators)
-                buil_generators="$2"
+                build_generators="$2"
                 shift ;;
             
             -i|--install-prefix)

From c67f7afa4920df3d7d188f797a868627fc8b215f Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Fri, 13 Jul 2018 13:45:39 +0300
Subject: [PATCH 11/25] Deny expired credentials

---
 src/browser/BrowserService.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 956eaf0b77..70b419a2c2 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -625,6 +625,9 @@ BrowserService::Access BrowserService::checkAccess(const Entry* entry, const QSt
     if (!config.load(entry)) {
         return Unknown;
     }
+    if (entry->isExpired()) {
+        return Denied;
+    }
     if ((config.isAllowed(host)) && (submitHost.isEmpty() || config.isAllowed(submitHost))) {
         return Allowed;
     }

From 3727d371019b2688ec623b64a966f17e57fea6bf Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Fri, 13 Jul 2018 17:41:47 +0300
Subject: [PATCH 12/25] SSH Agent: Expect passphrases to be in UTF-8

The previous default was to expect passphrases to be ASCII or
rather Latin-1. It would be reasonable to expect modern keys to
use UTF-8 instead.

This is a non-breaking change if passphrases only use characters
that fall within ASCII.

Fixes #2102
---
 src/sshagent/OpenSSHKey.cpp |  2 +-
 tests/TestOpenSSHKey.cpp    | 26 ++++++++++++++++++++++++++
 tests/TestOpenSSHKey.h      |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/sshagent/OpenSSHKey.cpp b/src/sshagent/OpenSSHKey.cpp
index cfff5a4006..4527bfb609 100644
--- a/src/sshagent/OpenSSHKey.cpp
+++ b/src/sshagent/OpenSSHKey.cpp
@@ -350,7 +350,7 @@ bool OpenSSHKey::openPrivateKey(const QString& passphrase)
         QByteArray decryptKey;
         decryptKey.fill(0, cipher->keySize() + cipher->blockSize());
 
-        QByteArray phraseData = passphrase.toLatin1();
+        QByteArray phraseData = passphrase.toUtf8();
         if (bcrypt_pbkdf(phraseData, salt, decryptKey, rounds) < 0) {
             m_error = tr("Key derivation failed, key file corrupted?");
             return false;
diff --git a/tests/TestOpenSSHKey.cpp b/tests/TestOpenSSHKey.cpp
index 8e226750cf..ab21c1a39b 100644
--- a/tests/TestOpenSSHKey.cpp
+++ b/tests/TestOpenSSHKey.cpp
@@ -427,3 +427,29 @@ void TestOpenSSHKey::testDecryptRSAAES256CTR()
     QCOMPARE(key.comment(), QString(""));
     QCOMPARE(key.fingerprint(), QString("SHA256:1Hsebt2WWnmc72FERsUOgvaajIGHkrMONxXylcmk87U"));
 }
+
+void TestOpenSSHKey::testDecryptUTF8()
+{
+    const QString keyString = QString(
+	"-----BEGIN OPENSSH PRIVATE KEY-----\n"
+	"b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDtSl4OvT\n"
+	"H/wHay2dvjOnpIAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIIhrBrn6rb+d3GwF\n"
+	"ifpJ6gYut95lXvwypiQmu9ZpA8H9AAAAsD85Gpn2mbVEWq3ygx11wBnN5mUQXnMuP48rLv\n"
+	"0qwm12IihOkrR925ledwN2Sa5mkkL0XjDz6SsKfIFhFa84hUHQdw5zPR8yVGRWLzkNDmo7\n"
+	"WXNpnoE4ebsX2j0TsBNjP80RUcJdjSXidkt3+aZjaCfquO8cBQn4GJJSDSPwFJYlJeSD/h\n"
+	"vpb72MEQchOD3NNMORYTJ5sOJ73RayhhmwjTVlrG+zYAw6fXW0YXX3+5LE\n"
+	"-----END OPENSSH PRIVATE KEY-----\n"
+    );
+
+    const QByteArray keyData = keyString.toLatin1();
+
+    OpenSSHKey key;
+    QVERIFY(key.parse(keyData));
+    QVERIFY(key.encrypted());
+    QCOMPARE(key.cipherName(), QString("aes256-ctr"));
+    QVERIFY(!key.openPrivateKey("incorrectpassphrase"));
+    QVERIFY(key.openPrivateKey("äåéëþüúíóö"));
+    QCOMPARE(key.fingerprint(), QString("SHA256:EfUXwvH4rOoys+AlbznCqjMwzIVW8KuhoWu9uT03FYA"));
+    QCOMPARE(key.type(), QString("ssh-ed25519"));
+    QCOMPARE(key.comment(), QString("opensshkey-test-utf8@keepassxc"));
+}
diff --git a/tests/TestOpenSSHKey.h b/tests/TestOpenSSHKey.h
index 77ca270d0e..214de89425 100644
--- a/tests/TestOpenSSHKey.h
+++ b/tests/TestOpenSSHKey.h
@@ -37,6 +37,7 @@ private slots:
     void testDecryptRSAAES256CBC();
     void testDecryptOpenSSHAES256CTR();
     void testDecryptRSAAES256CTR();
+    void testDecryptUTF8();
 };
 
 #endif // TESTOPENSSHKEY_H

From add4ba21fae14583587c3e9e33e6a60ae77d4691 Mon Sep 17 00:00:00 2001
From: Jonathan White <droidmonkey@users.noreply.github.com>
Date: Sat, 14 Jul 2018 17:08:04 -0400
Subject: [PATCH 13/25] Show all url schemas in entry view (#1768)

* Show all url schemas in entry view
* Fix UUID being built improperly with invalid user input
---
 src/core/Entry.cpp         |  3 +--
 src/core/Uuid.cpp          | 10 ++++++++--
 src/gui/DatabaseWidget.cpp | 28 +++++++++++++---------------
 src/gui/DetailsWidget.cpp  |  8 +++-----
 src/gui/DetailsWidget.ui   |  3 +++
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 25ef6b50ef..800de0b06e 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -287,8 +287,7 @@ QString Entry::webUrl() const
 QString Entry::displayUrl() const
 {
     QString url = maskPasswordPlaceholders(m_attributes->value(EntryAttributes::URLKey));
-    url = resolveMultiplePlaceholders(url);
-    return resolveUrl(url);
+    return resolveMultiplePlaceholders(url);
 }
 
 QString Entry::username() const
diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index 1b531159f8..cb32bfdc74 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -88,13 +88,19 @@ bool Uuid::operator!=(const Uuid& other) const
 Uuid Uuid::fromBase64(const QString& str)
 {
     QByteArray data = QByteArray::fromBase64(str.toLatin1());
-    return Uuid(data);
+    if (data.size() == Uuid::Length) {
+        return Uuid(data);
+    }
+    return {};
 }
 
 Uuid Uuid::fromHex(const QString& str)
 {
     QByteArray data = QByteArray::fromHex(str.toLatin1());
-    return Uuid(data);
+    if (data.size() == Uuid::Length) {
+        return Uuid(data);
+    }
+    return {};
 }
 
 uint qHash(const Uuid& key)
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 0573a01897..69c0e7c815 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -633,25 +633,22 @@ void DatabaseWidget::openUrl()
 
 void DatabaseWidget::openUrlForEntry(Entry* entry)
 {
-    QString urlString = entry->resolveMultiplePlaceholders(entry->url());
-    if (urlString.isEmpty()) {
-        return;
-    }
-
-    if (urlString.startsWith("cmd://")) {
+    QString cmdString = entry->resolveMultiplePlaceholders(entry->url());
+    if (cmdString.startsWith("cmd://")) {
         // check if decision to execute command was stored
         if (entry->attributes()->hasKey(EntryAttributes::RememberCmdExecAttr)) {
             if (entry->attributes()->value(EntryAttributes::RememberCmdExecAttr) == "1") {
-                QProcess::startDetached(urlString.mid(6));
+                QProcess::startDetached(cmdString.mid(6));
             }
             return;
         }
 
         // otherwise ask user
-        if (urlString.length() > 6) {
-            QString cmdTruncated = urlString.mid(6);
-            if (cmdTruncated.length() > 400)
+        if (cmdString.length() > 6) {
+            QString cmdTruncated = cmdString.mid(6);
+            if (cmdTruncated.length() > 400) {
                 cmdTruncated = cmdTruncated.left(400) + " […]";
+            }
             QMessageBox msgbox(QMessageBox::Icon::Question,
                                tr("Execute command?"),
                                tr("Do you really want to execute the following command?<br><br>%1<br>")
@@ -672,7 +669,7 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
 
             int result = msgbox.exec();
             if (result == QMessageBox::Yes) {
-                QProcess::startDetached(urlString.mid(6));
+                QProcess::startDetached(cmdString.mid(6));
             }
 
             if (remember) {
@@ -680,10 +677,11 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
                                          result == QMessageBox::Yes ? "1" : "0");
             }
         }
-    }
-    else {
-        QUrl url = QUrl::fromUserInput(urlString);
-        QDesktopServices::openUrl(url);
+    } else {
+        QString urlString = entry->webUrl();
+        if (!urlString.isEmpty()) {
+            QDesktopServices::openUrl(urlString);
+        }
     }
 }
 
diff --git a/src/gui/DetailsWidget.cpp b/src/gui/DetailsWidget.cpp
index dcabf964ff..93b4b9f6e9 100644
--- a/src/gui/DetailsWidget.cpp
+++ b/src/gui/DetailsWidget.cpp
@@ -174,17 +174,15 @@ void DetailsWidget::updateEntryGeneralTab()
         m_ui->entryPasswordLabel->setToolTip({});
     }
 
+    m_ui->entryUrlLabel->setRawText(m_currentEntry->displayUrl());
     const QString url = m_currentEntry->webUrl();
     if (!url.isEmpty()) {
         // URL is well formed and can be opened in a browser
-        // create a new display url that masks password placeholders
-        // the actual link will use the password
-        m_ui->entryUrlLabel->setRawText(m_currentEntry->displayUrl());
         m_ui->entryUrlLabel->setUrl(url);
+        m_ui->entryUrlLabel->setCursor(Qt::PointingHandCursor);
     } else {
-        // Fallback to the raw url string
-        m_ui->entryUrlLabel->setRawText(m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->url()));
         m_ui->entryUrlLabel->setUrl({});
+        m_ui->entryUrlLabel->setCursor(Qt::ArrowCursor);
     }
 
     const TimeInfo entryTime = m_currentEntry->timeInfo();
diff --git a/src/gui/DetailsWidget.ui b/src/gui/DetailsWidget.ui
index 53787d7130..38906150e0 100644
--- a/src/gui/DetailsWidget.ui
+++ b/src/gui/DetailsWidget.ui
@@ -203,6 +203,9 @@
                 <property name="text">
                  <string/>
                 </property>
+                <property name="textInteractionFlags">
+                 <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+                </property>
                </widget>
               </item>
               <item row="0" column="2">

From 057cf6aed33599801b8b9a942ad32c62f2779a7d Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Wed, 11 Jul 2018 11:53:37 +0300
Subject: [PATCH 14/25] Handle URL port and scheme when requesting credentials

---
 src/browser/BrowserService.cpp | 22 +++++++++++++++-------
 src/browser/BrowserService.h   |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 70b419a2c2..80e2ba0516 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -366,7 +366,7 @@ void BrowserService::updateEntry(const QString& id, const QString& uuid, const Q
     }
 }
 
-QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostname)
+QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostname, const QString& url)
 {
     QList<Entry*> entries;
     Group* rootGroup = db->rootGroup();
@@ -375,11 +375,19 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
     }
 
     for (Entry* entry : EntrySearcher().search(hostname, rootGroup, Qt::CaseInsensitive)) {
-        QString url = entry->url();
+        QString entryUrl = entry->url();
+        QUrl entryQUrl(entryUrl);
+        QString entryScheme = entryQUrl.scheme();
+        QUrl qUrl(url);
+
+        // Ignore entry if port or scheme defined in the URL doesn't match    
+        if ((entryQUrl.port() > 0 && entryQUrl.port() != qUrl.port()) || entryScheme.compare(qUrl.scheme()) != 0) {
+            continue;
+        }
 
         // Filter to match hostname in URL field
-        if ((!url.isEmpty() && hostname.contains(url))
-            || (matchUrlScheme(url) && hostname.endsWith(QUrl(url).host()))) {
+        if ((!entryUrl.isEmpty() && hostname.contains(entryUrl))
+            || (matchUrlScheme(entryUrl) && hostname.endsWith(entryQUrl.host()))) {
                 entries.append(entry);
         }
     }
@@ -387,7 +395,7 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
     return entries;
 }
 
-QList<Entry*> BrowserService::searchEntries(const QString& text, const StringPairList& keyList)
+QList<Entry*> BrowserService::searchEntries(const QString& url, const StringPairList& keyList)
 {
     // Get the list of databases to search
     QList<Database*> databases;
@@ -414,11 +422,11 @@ QList<Entry*> BrowserService::searchEntries(const QString& text, const StringPai
     }
 
     // Search entries matching the hostname
-    QString hostname = QUrl(text).host();
+    QString hostname = QUrl(url).host();
     QList<Entry*> entries;
     do {
         for (Database* db : databases) {
-            entries << searchEntries(db, hostname);
+            entries << searchEntries(db, hostname, url);
         }
     } while (entries.isEmpty() && removeFirstDomain(hostname));
 
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index eb47aac07a..f65f6af595 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -42,8 +42,8 @@ class BrowserService : public QObject
     Entry*          getConfigEntry(bool create = false);
     QString         getKey(const QString& id);
     void            addEntry(const QString& id, const QString& login, const QString& password, const QString& url, const QString& submitUrl, const QString& realm);
-    QList<Entry*>   searchEntries(Database* db, const QString& hostname);
-    QList<Entry*>   searchEntries(const QString& text, const StringPairList& keyList);
+    QList<Entry*>   searchEntries(Database* db, const QString& hostname, const QString& url);
+    QList<Entry*>   searchEntries(const QString& url, const StringPairList& keyList);
     void            removeSharedEncryptionKeys();
     void            removeStoredPermissions();
 

From 41ebc10c037492df13274e5f8619227b098b5533 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 22 Jul 2018 11:20:50 -0400
Subject: [PATCH 15/25] Corrects ordering of command/opts in cli manpage

---
 src/cli/keepassxc-cli.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/keepassxc-cli.1 b/src/cli/keepassxc-cli.1
index cc1e7b8d75..cd428e1059 100644
--- a/src/cli/keepassxc-cli.1
+++ b/src/cli/keepassxc-cli.1
@@ -5,8 +5,8 @@ keepassxc-cli \- command line interface for the \fBKeePassXC\fP password manager
 
 .SH SYNOPSIS
 .B keepassxc-cli
-.RI [ options ]
 .I command
+.RI [ options ]
 
 .SH DESCRIPTION
 \fBkeepassxc-cli\fP is the command line interface for the \fBKeePassXC\fP password manager. It provides the ability to query and modify the entries of a KeePass database, directly from the command line.

From d70a474bacbf531f1e7a7bb020b97f5a5e7a3be5 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Tue, 7 Aug 2018 08:27:19 +0300
Subject: [PATCH 16/25] Allows a separate ID key for browser extension
 association

---
 src/browser/BrowserAction.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp
index 96090258a6..78ca53c1e3 100755
--- a/src/browser/BrowserAction.cpp
+++ b/src/browser/BrowserAction.cpp
@@ -169,7 +169,9 @@ QJsonObject BrowserAction::handleAssociate(const QJsonObject& json, const QStrin
 
     QMutexLocker locker(&m_mutex);
     if (key.compare(m_clientPublicKey, Qt::CaseSensitive) == 0) {
-        const QString id = m_browserService.storeKey(key);
+        // Check for identification key. If it's not found, ensure backwards compatibility and use the current public key
+        const QString idKey = decrypted.value("idKey").toString();
+        const QString id = m_browserService.storeKey((idKey.isEmpty() ? key: idKey));
         if (id.isEmpty()) {
             return getErrorReply(action, ERROR_KEEPASS_ACTION_CANCELLED_OR_DENIED);
         }

From 3b1e15ea1a0f971812cadc26135a36aa73486341 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 13 Aug 2018 09:04:18 -0400
Subject: [PATCH 17/25] Disable apply button when creating new entry/group

* Workaround to prevent data loss if apply is hit but not OK or Cancel
* Refactor required to fix this issue
---
 src/gui/EditWidget.cpp            | 23 ++++++++++++++++-------
 src/gui/EditWidget.h              |  4 +++-
 src/gui/entry/EditEntryWidget.cpp |  4 ++--
 src/gui/group/EditGroupWidget.cpp |  6 ++++--
 tests/gui/TestGui.cpp             |  8 ++++++--
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index 65c6306e1c..7950fe987e 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -97,18 +97,14 @@ QLabel* EditWidget::headlineLabel()
     return m_ui->headerLabel;
 }
 
-void EditWidget::setReadOnly(bool readOnly)
+void EditWidget::setReadOnly(bool readOnly, bool applyEnabled)
 {
     m_readOnly = readOnly;
 
     if (readOnly) {
         m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Close);
-    }
-    else {
-        m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
-        // Find and connect the apply button
-        QPushButton* applyButton = m_ui->buttonBox->button(QDialogButtonBox::Apply);
-        connect(applyButton, SIGNAL(clicked()), SIGNAL(apply()));
+    } else {
+        setupButtons(applyEnabled);
     }
 }
 
@@ -117,6 +113,19 @@ bool EditWidget::readOnly() const
     return m_readOnly;
 }
 
+void EditWidget::setupButtons(bool applyEnabled)
+{
+    if (applyEnabled) {
+        m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
+        // Find and connect the apply button
+        QPushButton* applyButton = m_ui->buttonBox->button(QDialogButtonBox::Apply);
+        connect(applyButton, SIGNAL(clicked()), SIGNAL(apply()));
+    } else {
+        m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        disconnect(SIGNAL(apply()));
+    }
+}
+
 void EditWidget::showMessage(const QString& text, MessageWidget::MessageType type)
 {
     m_ui->messageWidget->setCloseButtonVisible(false);
diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h
index 442365b96b..8b89f1f8f6 100644
--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@@ -45,7 +45,7 @@ class EditWidget : public DialogyWidget
     void setCurrentPage(int index);
     void setHeadline(const QString& text);
     QLabel* headlineLabel();
-    void setReadOnly(bool readOnly);
+    void setReadOnly(bool readOnly, bool applyEnabled = true);
     bool readOnly() const;
 
 signals:
@@ -58,6 +58,8 @@ protected slots:
     void hideMessage();
 
 private:
+    void setupButtons(bool applyEnabled);
+
     const QScopedPointer<Ui::EditWidget> m_ui;
     bool m_readOnly;
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 6fd65c1a30..2e03eb3c8e 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -597,7 +597,8 @@ void EditEntryWidget::loadEntry(Entry* entry, bool create, bool history, const Q
     }
 
     setForms(entry);
-    setReadOnly(m_history);
+    // Disable apply button if creating new entry (#2191)
+    setReadOnly(m_history, !m_create);
 
     setCurrentPage(0);
     setPageHidden(m_historyWidget, m_history || m_entry->historyItems().count() < 1);
@@ -802,7 +803,6 @@ void EditEntryWidget::acceptEntry()
 {
     if (commitEntry()) {
         clear();
-        hideMessage();
         emit editFinished(true);
     }
 }
diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp
index 9ffd31a5e0..46b0ae5bcb 100644
--- a/src/gui/group/EditGroupWidget.cpp
+++ b/src/gui/group/EditGroupWidget.cpp
@@ -61,8 +61,7 @@ void EditGroupWidget::loadGroup(Group* group, bool create, Database* database)
 
     if (create) {
         setHeadline(tr("Add group"));
-    }
-    else {
+    } else {
         setHeadline(tr("Edit group"));
     }
 
@@ -99,6 +98,9 @@ void EditGroupWidget::loadGroup(Group* group, bool create, Database* database)
 
     setCurrentPage(0);
 
+    // Disable apply button if creating new group
+    setReadOnly(false, create);
+
     m_mainUi->editName->setFocus();
 }
 
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 54203c284c..d0b5300283 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -477,6 +477,9 @@ void TestGui::testAddEntry()
     QTest::keyClicks(passwordRepeatEdit, "something 2");
     QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
 
+/* All apply tests disabled due to data loss workaround
+ * that disables apply button on new entry creation
+ *
     // Add entry "something 3" using the apply button then click ok
     QTest::mouseClick(entryNewWidget, Qt::LeftButton);
     QTest::keyClicks(titleEdit, "something 3");
@@ -488,6 +491,7 @@ void TestGui::testAddEntry()
     QTest::keyClicks(titleEdit, "something 4");
     QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton);
     QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Cancel), Qt::LeftButton);
+*/
 
     // Add entry "something 5" but click cancel button (does NOT add entry)
     QTest::mouseClick(entryNewWidget, Qt::LeftButton);
@@ -496,8 +500,8 @@ void TestGui::testAddEntry()
 
     QApplication::processEvents();
 
-    // Confirm that 5 entries now exist
-    QTRY_COMPARE(entryView->model()->rowCount(), 5);
+    // Confirm entry count
+    QTRY_COMPARE(entryView->model()->rowCount(), 3);
 }
 
 void TestGui::testPasswordEntryEntropy()

From 8db604e787bf506ed4bd17e2472acf31808bd835 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 14 Aug 2018 23:00:38 -0400
Subject: [PATCH 18/25] Fix occasional divide by zero crash

---
 src/gui/EditWidgetIcons.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index b13c8ba37a..8242c43995 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -51,7 +51,11 @@ UrlFetchProgressDialog::UrlFetchProgressDialog(const QUrl &url, QWidget *parent)
 
 void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes)
 {
-    setValue(static_cast<int>(bytesRead / totalBytes));
+    if (totalBytes > 0) {
+        setValue(static_cast<int>(bytesRead / totalBytes));
+    } else {
+        setValue(0);
+    }
 }
 
 EditWidgetIcons::EditWidgetIcons(QWidget* parent)

From 1d80bddde3b53a00075e30cac104e31eff13a4fd Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Mon, 28 May 2018 15:28:11 +0300
Subject: [PATCH 19/25] Quit the proxy when reading zero or less from stdin

---
 src/browser/NativeMessagingBase.h   |  2 +-
 src/browser/NativeMessagingHost.cpp |  7 ++++---
 src/browser/NativeMessagingHost.h   |  2 +-
 src/proxy/NativeMessagingHost.cpp   | 27 ++++++++++++++++++++++-----
 src/proxy/NativeMessagingHost.h     |  5 +++--
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/browser/NativeMessagingBase.h b/src/browser/NativeMessagingBase.h
index 2cd63d24cd..44a0f1768f 100644
--- a/src/browser/NativeMessagingBase.h
+++ b/src/browser/NativeMessagingBase.h
@@ -52,7 +52,7 @@ protected slots:
 
 protected:
     virtual void    readLength() = 0;
-    virtual void    readStdIn(const quint32 length) = 0;
+    virtual bool    readStdIn(const quint32 length) = 0;
     void            readNativeMessages();
     QString         jsonToString(const QJsonObject& json) const;
     void            sendReply(const QJsonObject& json);
diff --git a/src/browser/NativeMessagingHost.cpp b/src/browser/NativeMessagingHost.cpp
index cb757e65e7..7d14c9d30e 100755
--- a/src/browser/NativeMessagingHost.cpp
+++ b/src/browser/NativeMessagingHost.cpp
@@ -114,10 +114,10 @@ void NativeMessagingHost::readLength()
     }
 }
 
-void NativeMessagingHost::readStdIn(const quint32 length)
+bool NativeMessagingHost::readStdIn(const quint32 length)
 {
     if (length <= 0) {
-        return;
+        return false;
     }
 
     QByteArray arr;
@@ -129,7 +129,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
         int c = std::getchar();
         if (c == EOF) {
             // message ended prematurely, ignore it and return
-            return;
+            return false;
         }
         arr.append(static_cast<char>(c));
     }
@@ -137,6 +137,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
     if (arr.length() > 0) {
         sendReply(m_browserClients.readResponse(arr));
     }
+    return true;
 }
 
 void NativeMessagingHost::newLocalConnection()
diff --git a/src/browser/NativeMessagingHost.h b/src/browser/NativeMessagingHost.h
index cc0a2e84c4..29096d3110 100755
--- a/src/browser/NativeMessagingHost.h
+++ b/src/browser/NativeMessagingHost.h
@@ -46,7 +46,7 @@ public slots:
 
 private:
     void        readLength();
-    void        readStdIn(const quint32 length);
+    bool        readStdIn(const quint32 length);
     void        sendReplyToAllClients(const QJsonObject& json);
 
 private slots:
diff --git a/src/proxy/NativeMessagingHost.cpp b/src/proxy/NativeMessagingHost.cpp
index a0d713d0cf..83ca73d5ad 100755
--- a/src/proxy/NativeMessagingHost.cpp
+++ b/src/proxy/NativeMessagingHost.cpp
@@ -49,6 +49,21 @@ NativeMessagingHost::~NativeMessagingHost()
 #endif
 }
 
+void NativeMessagingHost::readNativeMessages()
+{
+#ifdef Q_OS_WIN
+    quint32 length = 0;
+    while (m_running.load() && !std::cin.eof()) {
+        length = 0;
+        std::cin.read(reinterpret_cast<char*>(&length), 4);
+        if (!readStdIn(length)) {
+            QCoreApplication::quit();
+        }
+        QThread::msleep(1);
+    }
+#endif
+}
+
 void NativeMessagingHost::readLength()
 {
     quint32 length = 0;
@@ -56,14 +71,14 @@ void NativeMessagingHost::readLength()
     if (!std::cin.eof() && length > 0) {
         readStdIn(length);
     } else {
-    	QCoreApplication::quit();
+        QCoreApplication::quit();
     }
 }
 
-void NativeMessagingHost::readStdIn(const quint32 length)
+bool NativeMessagingHost::readStdIn(const quint32 length)
 {
     if (length <= 0) {
-        return;
+        return false;
     }
 
     QByteArray arr;
@@ -73,7 +88,7 @@ void NativeMessagingHost::readStdIn(const quint32 length)
         int c = std::getchar();
         if (c == EOF) {
             // message ended prematurely, ignore it and return
-            return;
+            return false;
         }
         arr.append(static_cast<char>(c));
     }
@@ -82,6 +97,8 @@ void NativeMessagingHost::readStdIn(const quint32 length)
         m_localSocket->write(arr.constData(), arr.length());
         m_localSocket->flush();
     }
+    
+    return true;
 }
 
 void NativeMessagingHost::newLocalMessage()
@@ -92,7 +109,7 @@ void NativeMessagingHost::newLocalMessage()
 
     QByteArray arr = m_localSocket->readAll();
     if (!arr.isEmpty()) {
-       sendReply(arr);
+        sendReply(arr);
     }
 }
 
diff --git a/src/proxy/NativeMessagingHost.h b/src/proxy/NativeMessagingHost.h
index 41f3ed753b..0ddd6b55f7 100755
--- a/src/proxy/NativeMessagingHost.h
+++ b/src/proxy/NativeMessagingHost.h
@@ -33,11 +33,12 @@ public slots:
     void socketStateChanged(QLocalSocket::LocalSocketState socketState);
 
 private:
+    void readNativeMessages();
     void readLength();
-    void readStdIn(const quint32 length);
+    bool readStdIn(const quint32 length);
 
 private:
-    QLocalSocket*                           m_localSocket;
+    QLocalSocket*   m_localSocket;
 };
 
 #endif // NATIVEMESSAGINGHOST_H

From 38e48e7591b54a1b7e4ef00473ae6353130fedbb Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Fri, 3 Aug 2018 13:36:11 +0300
Subject: [PATCH 20/25] Use Chrome registry settings with Vivaldi

---
 src/browser/BrowserOptionDialog.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp
index bcf96a85fb..52eece45fd 100755
--- a/src/browser/BrowserOptionDialog.cpp
+++ b/src/browser/BrowserOptionDialog.cpp
@@ -47,6 +47,11 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent) :
     connect(m_ui->useCustomProxy, SIGNAL(toggled(bool)), m_ui->customProxyLocationBrowseButton, SLOT(setEnabled(bool)));
     connect(m_ui->customProxyLocationBrowseButton, SIGNAL(clicked()), this, SLOT(showProxyLocationFileDialog()));
 
+#ifdef Q_OS_WIN
+    // Vivaldi uses Chrome's registry settings
+    m_ui->vivaldiSupport->setHidden(true);
+    m_ui->chromeSupport->setText("Chrome and Vivaldi");
+#endif
     m_ui->browserGlobalWarningWidget->setVisible(false);
 }
 

From 95a60087f920d8796583be6034ed42ef09f07b38 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Fri, 27 Jul 2018 19:32:58 +0300
Subject: [PATCH 21/25] Add browser extension links to settings page

---
 src/browser/BrowserOptionDialog.cpp |  5 +++++
 src/browser/BrowserOptionDialog.ui  | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp
index 52eece45fd..1bc17a278b 100755
--- a/src/browser/BrowserOptionDialog.cpp
+++ b/src/browser/BrowserOptionDialog.cpp
@@ -34,6 +34,11 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent) :
     connect(m_ui->removeSharedEncryptionKeys, SIGNAL(clicked()), this, SIGNAL(removeSharedEncryptionKeys()));
     connect(m_ui->removeStoredPermissions, SIGNAL(clicked()), this, SIGNAL(removeStoredPermissions()));
 
+    m_ui->extensionLabel->setOpenExternalLinks(true);
+    m_ui->extensionLabel->setText(tr("KeePassXC-Browser is needed for the browser integration to work. <br />Download it for %1 and %2.").arg(
+        "<a href=\"https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/\">Firefox</a>",
+        "<a href=\"https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk\">Google Chrome / Chromium / Vivaldi</a>"));
+
     m_ui->warningWidget->showMessage(tr("<b>Warning:</b> The following options can be dangerous!"), MessageWidget::Warning);
     m_ui->warningWidget->setCloseButtonVisible(false);
     m_ui->warningWidget->setAutoHideTimeout(-1);
diff --git a/src/browser/BrowserOptionDialog.ui b/src/browser/BrowserOptionDialog.ui
index e823794524..24589c147f 100755
--- a/src/browser/BrowserOptionDialog.ui
+++ b/src/browser/BrowserOptionDialog.ui
@@ -49,6 +49,26 @@
        <string>General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="extensionLabel">
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_1">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>4</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QGroupBox" name="browsersGroupBox">
          <property name="title">

From bb73df5d77ac4554101f94b5e2182416adaeadf5 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sat, 18 Aug 2018 10:33:49 -0400
Subject: [PATCH 22/25] Provide warning to users with Qt 5.5.x about potential
 crash

---
 src/gui/MainWindow.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 1299f3c4d6..0a852ce669 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -426,11 +426,18 @@ MainWindow::MainWindow()
     }
 #endif
 
-#ifndef KEEPASSXC_BUILD_TYPE_RELEASE
+#if !defined(KEEPASSXC_BUILD_TYPE_RELEASE)
     m_ui->globalMessageWidget->showMessage(tr("WARNING: You are using an unstable build of KeePassXC!\n"
                                               "There is a high risk of corruption, maintain a backup of your databases.\n"
                                               "This version is not meant for production use."),
-                                           MessageWidget::Warning, -1);
+                                          MessageWidget::Warning, -1);
+#elif (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
+    if (!config()->get("QtErrorMessageShown", false).toBool()) {
+        m_ui->globalMessageWidget->showMessage(tr("WARNING: You are using a version of Qt that causes KeePassXC to crash!\n"
+                                                  "We recommend you use the AppImage version available on our downloads page."),
+                                              MessageWidget::Warning, -1);
+        config()->set("QtErrorMessageShown", true);
+    }
 #else
     // Show the HTTP deprecation message if enabled above
     emit m_ui->globalMessageWidget->hideAnimationFinished();

From 67304c71a0a7f2dac397f0bc1caca439afaa5bb7 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 20 Aug 2018 18:46:46 -0400
Subject: [PATCH 23/25] Enhancements to About dialog and add settings button to
 toolbar

* Added Patreon contributors
* Added real names to project maintainers
* Cleaned up layout
* Added settings button to main toolbar
* Added actions for "Donate" and "Report a Bug" to help menu
---
 share/about-contributors.html |  54 +++++++++++++
 share/about.html              |  14 ++++
 src/gui/AboutDialog.ui        | 144 ++++++++++++++++++++--------------
 src/gui/MainWindow.cpp        |  31 ++++++--
 src/gui/MainWindow.h          |   4 +-
 src/gui/MainWindow.ui         |  33 ++++++--
 src/gui/SearchWidget.ui       |   4 +-
 7 files changed, 211 insertions(+), 73 deletions(-)
 create mode 100644 share/about-contributors.html
 create mode 100644 share/about.html

diff --git a/share/about-contributors.html b/share/about-contributors.html
new file mode 100644
index 0000000000..77ceadb5fb
--- /dev/null
+++ b/share/about-contributors.html
@@ -0,0 +1,54 @@
+<h3>VIP Patreon Supporters:</h3>
+<ul>
+  <li>John Cook</li>
+  <li>Max Anderson</li>
+</ul>
+<h3>Notable Code Contributions:</h3>
+<ul>
+  <li>droidmonkey</li>
+  <li>phoerious</li>
+  <li>TheZ3ro</li>
+  <li>louib</li>
+  <li>weslly</li>
+  <li>varjolintu (KeePassXC-Browser)</li>
+  <li>hifi (SSH Agent)</li>
+  <li>frostasm</li>
+  <li>fonic (Entry Table View)</li>
+  <li>kylemanna (YubiKey)</li>
+  <li>keithbennett (KeePassHTTP)</li>
+  <li>Typz (KeePassHTTP)</li>
+  <li>denk-mal (KeePassHTTP)</li>
+  <li>angelsl (KDBX 4)</li>
+  <li>seatedscribe (CSV Import)</li>
+  <li>debfx (KeePassX)</li>
+  <li>BlueIce (KeePassX)</li>
+</ul>
+<h3>Patreon Supporters:</h3>
+<ul>
+  <li>Ashura</li>
+  <li>Alexanderjb</li>
+  <li>Andreas Kollmann</li>
+  <li>Richard Ames</li>
+</ul>
+<h3>Translations:</h3>
+<ul>
+  <li><strong>Basque</strong>: azken_tximinoa, Hey_neken</li>
+  <li><strong>Catalan</strong>: capitantrueno, dsoms, mcus, raulua, ZJaume</li>
+  <li><strong>Chinese (China)</strong>: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku</li>
+  <li><strong>Chinese (Taiwan)</strong>: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808</li>
+  <li><strong>Czech</strong>: DanielMilde, JosefVitu, pavelb, tpavelek</li>
+  <li><strong>Danish</strong>: nlkl</li>
+  <li><strong>Dutch</strong>: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea</li>
+  <li><strong>Finnish</strong>: artnay, Jarppi, MawKKe</li>
+  <li><strong>French</strong>: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset</li>
+  <li><strong>German</strong>: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster</li>
+  <li><strong>Greek</strong>: magkopian, nplatis, tassos.b, xinomilo</li>
+  <li><strong>Hungarian</strong>: bubu, meskobalazs, urbalazs</li>
+  <li><strong>Indonesian</strong>: zk</li>
+  <li><strong>Italian</strong>: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo</li>
+  <li><strong>Japanese</strong>: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato</li>
+  <li><strong>Korean</strong>: cancantun, peremen</li>
+  <li><strong>Lithuanian</strong>: Moo</li>
+  <li><strong>Polish</strong>: keypress, konradmb, mrerexx, psobczak</li>
+  <li><strong>Portuguese (Brazil)</strong>: danielbibit, fabiom, flaviobn, vitor895, weslly</li>
+</ul>
diff --git a/share/about.html b/share/about.html
new file mode 100644
index 0000000000..3d0e8974d7
--- /dev/null
+++ b/share/about.html
@@ -0,0 +1,14 @@
+<p>Website: <a href="https://keepassxc.org/" style="text-decoration: underline">https://keepassxc.org</a></p>
+<p>Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues">https://github.com</a></p>
+<p>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</p>
+<h3>Project Maintainers:</h3>
+<ul>
+    <li>Jonathan White (<a href="https://github.com/droidmonkey">droidmonkey</a>)</li>
+    <li>Janek Bevendorff (<a href="https://github.com/phoerious">phoerious</a>)</li>
+    <li><a href="https://github.com/TheZ3ro">TheZ3ro</a></li>
+    <li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
+    <li>Weslly Honorato (<a href="https://github.com/weslly">weslly</a>)</li>
+    <li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
+    <li>Sami V&auml;nttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
+</ul>
+<p>Special thanks from the KeePassXC team go to <a href="https://github.com/debfx">debfx</a> for creating the original KeePassX.</p>
\ No newline at end of file
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index 39963c1214..2b274544a4 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>AboutDialog</class>
  <widget class="QDialog" name="AboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>510</width>
+    <height>443</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>About KeePassXC</string>
   </property>
@@ -68,7 +76,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab">
+     <widget class="QWidget" name="aboutTab">
       <attribute name="title">
        <string>About</string>
       </attribute>
@@ -164,13 +172,21 @@
          </property>
          <property name="text">
           <string notr="true">&lt;ul&gt;
-    &lt;li&gt;droidmonkey&lt;/li&gt;
-    &lt;li&gt;phoerious&lt;/li&gt;
-    &lt;li&gt;TheZ3ro&lt;/li&gt;
-    &lt;li&gt;louib&lt;/li&gt;
-    &lt;li&gt;weslly&lt;/li&gt;
+    &lt;li&gt;Jonathan White (&lt;a href=&quot;https://github.com/droidmonkey&quot;&gt;droidmonkey&lt;/a&gt;)&lt;/li&gt;
+    &lt;li&gt;Janek Bevendorff (&lt;a href=&quot;https://github.com/phoerious&quot;&gt;phoerious&lt;/a&gt;)&lt;/li&gt;
+    &lt;li&gt;&lt;a href=&quot;https://github.com/TheZ3ro&quot;&gt;TheZ3ro&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;Louis-Bertrand (&lt;a href=&quot;https://github.com/louib&quot;&gt;louib&lt;/a&gt;)&lt;/li&gt;
+    &lt;li&gt;Weslly Honorato (&lt;a href=&quot;https://github.com/weslly&quot;&gt;weslly&lt;/a&gt;)&lt;/li&gt;
+    &lt;li&gt;Toni Spets (&lt;a href=&quot;https://github.com/hifi&quot;&gt;hifi&lt;/a&gt;)&lt;/li&gt;
+    &lt;li&gt;Sami V&amp;auml;nttinen (&lt;a href=&quot;https://github.com/varjolintu&quot;&gt;varjolintu&lt;/a&gt;)&lt;/li&gt;
 &lt;/ul&gt;</string>
          </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+         </property>
         </widget>
        </item>
        <item>
@@ -187,6 +203,9 @@
          <property name="wordWrap">
           <bool>true</bool>
          </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+         </property>
         </widget>
        </item>
        <item>
@@ -204,7 +223,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3">
+     <widget class="QWidget" name="contribTab">
       <attribute name="title">
        <string>Contributors</string>
       </attribute>
@@ -220,7 +239,7 @@
             <x>0</x>
             <y>0</y>
             <width>449</width>
-            <height>803</height>
+            <height>845</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -236,63 +255,74 @@
               <cursorShape>IBeamCursor</cursorShape>
              </property>
              <property name="text">
-              <string notr="true">&lt;h3&gt;Notable Code Contributions:&lt;/h3&gt;
+              <string notr="true">&lt;h3&gt;VIP Patreon Supporters:&lt;/h3&gt;
 &lt;ul&gt;
-&lt;li&gt;droidmonkey&lt;/li&gt;
-&lt;li&gt;phoerious&lt;/li&gt;
-&lt;li&gt;TheZ3ro&lt;/li&gt;
-&lt;li&gt;louib&lt;/li&gt;
-&lt;li &gt;weslly&lt;/li&gt;
-&lt;li&gt;varjolintu (KeePassXC-Browser)&lt;/li&gt;
-&lt;li&gt;hifi (SSH Agent)&lt;/li&gt;
-&lt;li&gt;frostasm&lt;/li&gt;
-&lt;li&gt;fonic (Entry Table View)&lt;/li&gt;
-&lt;li&gt;kylemanna (YubiKey)&lt;/li&gt;
-&lt;li&gt;keithbennett (KeePassHTTP)&lt;/li&gt;
-&lt;li&gt;Typz (KeePassHTTP)&lt;/li&gt;
-&lt;li&gt;denk-mal (KeePassHTTP)&lt;/li&gt;
-&lt;li&gt;angelsl (KDBX 4)&lt;/li&gt;
-&lt;li&gt;seatedscribe (CSV Import)&lt;/li&gt;
-&lt;li&gt;debfx (KeePassX)&lt;/li&gt;
-&lt;li&gt;BlueIce (KeePassX)&lt;/li&gt;
+  &lt;li&gt;John Cook&lt;/li&gt;
+  &lt;li&gt;Max Anderson&lt;/li&gt;
+&lt;/ul&gt;
+&lt;h3&gt;Notable Code Contributions:&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;droidmonkey&lt;/li&gt;
+  &lt;li&gt;phoerious&lt;/li&gt;
+  &lt;li&gt;TheZ3ro&lt;/li&gt;
+  &lt;li&gt;louib&lt;/li&gt;
+  &lt;li&gt;weslly&lt;/li&gt;
+  &lt;li&gt;varjolintu (KeePassXC-Browser)&lt;/li&gt;
+  &lt;li&gt;hifi (SSH Agent)&lt;/li&gt;
+  &lt;li&gt;frostasm&lt;/li&gt;
+  &lt;li&gt;fonic (Entry Table View)&lt;/li&gt;
+  &lt;li&gt;kylemanna (YubiKey)&lt;/li&gt;
+  &lt;li&gt;keithbennett (KeePassHTTP)&lt;/li&gt;
+  &lt;li&gt;Typz (KeePassHTTP)&lt;/li&gt;
+  &lt;li&gt;denk-mal (KeePassHTTP)&lt;/li&gt;
+  &lt;li&gt;angelsl (KDBX 4)&lt;/li&gt;
+  &lt;li&gt;seatedscribe (CSV Import)&lt;/li&gt;
+  &lt;li&gt;debfx (KeePassX)&lt;/li&gt;
+  &lt;li&gt;BlueIce (KeePassX)&lt;/li&gt;
+&lt;/ul&gt;
+&lt;h3&gt;Patreon Supporters:&lt;/h3&gt;
+&lt;ul&gt;
+  &lt;li&gt;Ashura&lt;/li&gt;
+  &lt;li&gt;Alexanderjb&lt;/li&gt;
+  &lt;li&gt;Andreas Kollmann&lt;/li&gt;
+  &lt;li&gt;Richard Ames&lt;/li&gt;
 &lt;/ul&gt;
-
 &lt;h3&gt;Translations:&lt;/h3&gt;
 &lt;ul&gt;
-&lt;li&gt;&lt;b&gt;Basque:&lt;/b&gt; azken_tximinoa, Hey_neken&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Catalan:&lt;/b&gt; capitantrueno, dsoms, mcus, raulua, ZJaume&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Chinese (China):&lt;/b&gt; Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Chinese (Taiwan):&lt;/b&gt; BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Czech:&lt;/b&gt; DanielMilde, JosefVitu, pavelb, tpavelek&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Danish:&lt;/b&gt; nlkl&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Dutch:&lt;/b&gt; apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Finnish:&lt;/b&gt; artnay, Jarppi, MawKKe &lt;/li&gt;
-&lt;li&gt;&lt;b&gt;French:&lt;/b&gt; A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;German:&lt;/b&gt; antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Greek:&lt;/b&gt; magkopian, nplatis, tassos.b, xinomilo&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Hungarian:&lt;/b&gt; bubu, meskobalazs, urbalazs&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Indonesian:&lt;/b&gt; zk&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Italian:&lt;/b&gt; amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Japanese:&lt;/b&gt; masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Korean:&lt;/b&gt; cancantun, peremen&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Lithuanian:&lt;/b&gt; Moo&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Polish:&lt;/b&gt; keypress, konradmb, mrerexx, psobczak&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Portuguese (Brazil): &lt;/b&gt; danielbibit, fabiom, flaviobn, vitor895, weslly&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Portuguese (Portugal): &lt;/b&gt; American_Jesus, hds, mihai.ile, VictorR2007, smarquespt&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Russian:&lt;/b&gt; _nomoretears_, agag11507, anm, denoos, KekcuHa, Mogost, NcNZllQnHVU, netforhack, NetWormKido, RKuchma, VictorR2007, vsvyatski, wkill95&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Spanish:&lt;/b&gt; antifaz, EdwardNavarro, eliluminado, gonrial, jojobrambs, LeoBeltran, piegope, pquin, puchrojo, vargas.peniel, vsvyatski, Zranz&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Swedish:&lt;/b&gt; Anders_Bergqvist, LIINdd, henziger, jpyllman, peron&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Thai:&lt;/b&gt; arthit&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Turkish:&lt;/b&gt; etc, N3pp&lt;/li&gt;
-&lt;li&gt;&lt;b&gt;Ukrainian:&lt;/b&gt; brisk022, netforhack, zoresvit&lt;/li&gt;
-&lt;/ul&gt;</string>
+  &lt;li&gt;&lt;strong&gt;Basque&lt;/strong&gt;: azken_tximinoa, Hey_neken&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Catalan&lt;/strong&gt;: capitantrueno, dsoms, mcus, raulua, ZJaume&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Chinese (China)&lt;/strong&gt;: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Chinese (Taiwan)&lt;/strong&gt;: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Czech&lt;/strong&gt;: DanielMilde, JosefVitu, pavelb, tpavelek&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Danish&lt;/strong&gt;: nlkl&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Dutch&lt;/strong&gt;: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Finnish&lt;/strong&gt;: artnay, Jarppi, MawKKe&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;French&lt;/strong&gt;: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;German&lt;/strong&gt;: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Greek&lt;/strong&gt;: magkopian, nplatis, tassos.b, xinomilo&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Hungarian&lt;/strong&gt;: bubu, meskobalazs, urbalazs&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Indonesian&lt;/strong&gt;: zk&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Italian&lt;/strong&gt;: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Japanese&lt;/strong&gt;: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Korean&lt;/strong&gt;: cancantun, peremen&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Lithuanian&lt;/strong&gt;: Moo&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Polish&lt;/strong&gt;: keypress, konradmb, mrerexx, psobczak&lt;/li&gt;
+  &lt;li&gt;&lt;strong&gt;Portuguese (Brazil)&lt;/strong&gt;: danielbibit, fabiom, flaviobn, vitor895, weslly&lt;/li&gt;
+&lt;/ul&gt;
+</string>
              </property>
              <property name="textFormat">
-              <enum>Qt::RichText</enum>
+              <enum>Qt::AutoText</enum>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
              </property>
              <property name="wordWrap">
               <bool>true</bool>
              </property>
+             <property name="margin">
+              <number>5</number>
+             </property>
              <property name="textInteractionFlags">
               <set>Qt::TextBrowserInteraction</set>
              </property>
@@ -303,7 +333,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_6">
+        <widget class="QLabel" name="seeContributions">
          <property name="text">
           <string>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</string>
          </property>
@@ -317,7 +347,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
+     <widget class="QWidget" name="debugTab">
       <attribute name="title">
        <string>Debug Info</string>
       </attribute>
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 0a852ce669..b450268c32 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -23,6 +23,7 @@
 #include <QMimeData>
 #include <QShortcut>
 #include <QTimer>
+#include <QDesktopServices>
 
 #include "config-keepassx.h"
 
@@ -389,7 +390,7 @@ MainWindow::MainWindow()
     m_actionMultiplexer.connect(m_ui->actionGroupEmptyRecycleBin, SIGNAL(triggered()),
             SLOT(emptyRecycleBin()));
 
-    connect(m_ui->actionSettings, SIGNAL(triggered()), SLOT(switchToSettings()));
+    connect(m_ui->actionSettings, SIGNAL(toggled(bool)), SLOT(switchToSettings(bool)));
     connect(m_ui->actionPasswordGenerator, SIGNAL(toggled(bool)), SLOT(switchToPasswordGen(bool)));
     connect(m_ui->passwordGeneratorWidget, SIGNAL(dialogTerminated()), SLOT(closePasswordGen()));
 
@@ -400,6 +401,8 @@ MainWindow::MainWindow()
     connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToImportCsv()));
 
     connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));
+    connect(m_ui->actionDonate, SIGNAL(triggered()), SLOT(openDonateUrl()));
+    connect(m_ui->actionBugReport, SIGNAL(triggered()), SLOT(openBugReportUrl()));
 
 #ifdef Q_OS_MAC
     setUnifiedTitleAndToolBarOnMac(true);
@@ -662,6 +665,10 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
         bool blocked = m_ui->actionPasswordGenerator->blockSignals(true);
         m_ui->actionPasswordGenerator->toggle();
         m_ui->actionPasswordGenerator->blockSignals(blocked);
+    } else if ((currentIndex == SettingsScreen) != m_ui->actionSettings->isChecked()) {
+        bool blocked = m_ui->actionSettings->blockSignals(true);
+        m_ui->actionSettings->toggle();
+        m_ui->actionSettings->blockSignals(blocked);
     }
 }
 
@@ -710,6 +717,16 @@ void MainWindow::showAboutDialog()
     aboutDialog->open();
 }
 
+void MainWindow::openDonateUrl()
+{
+    QDesktopServices::openUrl(QUrl("https://keepassxc.org/donate"));
+}
+
+void MainWindow::openBugReportUrl()
+{
+    QDesktopServices::openUrl(QUrl("https://github.com/keepassxreboot/keepassxc/issues"));
+}
+
 void MainWindow::switchToDatabases()
 {
     if (m_ui->tabWidget->currentIndex() == -1) {
@@ -720,15 +737,19 @@ void MainWindow::switchToDatabases()
     }
 }
 
-void MainWindow::switchToSettings()
+void MainWindow::switchToSettings(bool enabled)
 {
-    m_ui->settingsWidget->loadSettings();
-    m_ui->stackedWidget->setCurrentIndex(SettingsScreen);
+    if (enabled) {
+        m_ui->settingsWidget->loadSettings();
+        m_ui->stackedWidget->setCurrentIndex(SettingsScreen);
+    } else {
+        switchToDatabases();
+    }
 }
 
 void MainWindow::switchToPasswordGen(bool enabled)
 {
-    if (enabled == true) {
+    if (enabled) {
       m_ui->passwordGeneratorWidget->loadSettings();
       m_ui->passwordGeneratorWidget->regeneratePassword();
       m_ui->passwordGeneratorWidget->setStandaloneMode(true);
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 20e548910f..d23e9b35c5 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -77,8 +77,10 @@ private slots:
     void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);
     void updateWindowTitle();
     void showAboutDialog();
+    void openDonateUrl();
+    void openBugReportUrl();
     void switchToDatabases();
-    void switchToSettings();
+    void switchToSettings(bool enabled);
     void switchToPasswordGen(bool enabled);
     void switchToNewDatabase();
     void switchToOpenDatabase();
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 648a0e61ac..e9eeb9e6bd 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -175,6 +175,14 @@
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>21</height>
+    </rect>
+   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>&amp;Database</string>
@@ -213,6 +221,8 @@
      <string>&amp;Help</string>
     </property>
     <addaction name="actionAbout"/>
+    <addaction name="actionDonate"/>
+    <addaction name="actionBugReport"/>
    </widget>
    <widget class="QMenu" name="menuEntries">
     <property name="title">
@@ -308,6 +318,8 @@
    <addaction name="actionPasswordGenerator"/>
    <addaction name="actionLockDatabases"/>
    <addaction name="separator"/>
+   <addaction name="actionSettings"/>
+   <addaction name="separator"/>
   </widget>
   <action name="actionQuit">
    <property name="text">
@@ -442,14 +454,6 @@
     <string>&amp;Clone entry</string>
    </property>
   </action>
-  <action name="actionSearch">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Find</string>
-   </property>
-  </action>
   <action name="actionEntryCopyUsername">
    <property name="enabled">
     <bool>false</bool>
@@ -473,6 +477,9 @@
    </property>
   </action>
   <action name="actionSettings">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>&amp;Settings</string>
    </property>
@@ -591,6 +598,16 @@
     <bool>false</bool>
    </property>
   </action>
+  <action name="actionDonate">
+   <property name="text">
+    <string>&amp;Donate</string>
+   </property>
+  </action>
+  <action name="actionBugReport">
+   <property name="text">
+    <string>Report a &amp;bug</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/gui/SearchWidget.ui b/src/gui/SearchWidget.ui
index 1583ebe964..98395b68a0 100644
--- a/src/gui/SearchWidget.ui
+++ b/src/gui/SearchWidget.ui
@@ -16,7 +16,7 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,4">
    <property name="leftMargin">
     <number>3</number>
    </property>
@@ -36,7 +36,7 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>30</width>
        <height>20</height>
       </size>
      </property>

From d6cae74176c828150b1cb19fb11f47d0cd5ab0c0 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 21 Aug 2018 12:19:15 -0400
Subject: [PATCH 24/25] Release 2.3.4 version bump

* Corrects INSTALL.md build instructions for Windows (#2126)
* Rephrase Qt 5.5.x warning to include on-screen keyboard combo
---
 CHANGELOG                                      | 17 +++++++++++++++++
 CMakeLists.txt                                 |  2 +-
 INSTALL.md                                     |  4 ++++
 .../linux/org.keepassxc.KeePassXC.appdata.xml  | 18 ++++++++++++++++++
 snapcraft.yaml                                 |  2 +-
 src/gui/MainWindow.cpp                         |  4 ++--
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9eafaa6d84..20545c4430 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+2.3.4 (2018-08-21)
+=========================
+
+- Show all URL schemes in entry view [#1768]
+- Disable merge when database is locked [#1975]
+- Fix intermittent crashes with favorite icon downloads [#1980]
+- Provide potential crash warning to Qt 5.5.x users [#2211]
+- Disable apply button when creating new entry/group to prevent data loss [#2204]
+- Allow for 12 hour timeout to lock idle database [#2173]
+- Multiple SSH Agent fixes [#1981, #2117]
+- Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]
+- Fix browser proxy application not closing properly [#2142]
+- Add real names and Patreon supporters to about dialog [#2214]
+- Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]
+- Enhancements to release-tool to appsign intermediate build products [#2101]
+
+
 2.3.3 (2018-05-09)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ad273d76..70f14795c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_PATCH "4")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
diff --git a/INSTALL.md b/INSTALL.md
index 86048b501e..a581d1ac7a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -38,6 +38,7 @@ Prepare the Building Environment
 
 Build Steps
 ===========
+We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
 **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
@@ -68,6 +69,9 @@ cd build
 cmake -DWITH_TESTS=OFF ...and other options - see below...
 make
 ```
+
+If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information.
+
 These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
 (Note the cmake notes/options below.)
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 2f1747949c..554bcdefa5 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,24 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.4" date="2018-08-21">
+            <description>
+                <ul>
+                    <li>Show all URL schemes in entry view [#1768]</li>
+                    <li>Disable merge when database is locked [#1975]</li>
+                    <li>Fix intermittent crashes with favorite icon downloads [#1980]</li>
+                    <li>Provide potential crash warning to Qt 5.5.x users [#2211]</li>
+                    <li>Disable apply button when creating new entry/group to prevent data loss [#2204]</li>
+                    <li>Allow for 12 hour timeout to lock idle database [#2173]</li>
+                    <li>Multiple SSH Agent fixes [#1981, #2117]</li>
+                    <li>Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]</li>
+                    <li>Fix browser proxy application not closing properly [#2142]</li>
+                    <li>Add real names and Patreon supporters to about dialog [#2214]</li>
+                    <li>Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]</li>
+                    <li>Enhancements to release-tool to appsign intermediate build products [#2101]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.3" date="2018-05-09">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 83f003aeaa..612fa2e644 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.3
+version: 2.3.4
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index b450268c32..f6cc2e4bb4 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -436,8 +436,8 @@ MainWindow::MainWindow()
                                           MessageWidget::Warning, -1);
 #elif (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
     if (!config()->get("QtErrorMessageShown", false).toBool()) {
-        m_ui->globalMessageWidget->showMessage(tr("WARNING: You are using a version of Qt that causes KeePassXC to crash!\n"
-                                                  "We recommend you use the AppImage version available on our downloads page."),
+        m_ui->globalMessageWidget->showMessage(tr("WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!\n"
+                                                  "We recommend you use the AppImage available on our downloads page."),
                                               MessageWidget::Warning, -1);
         config()->set("QtErrorMessageShown", true);
     }

From b0812c223534c99368facc36002d7064a70ccd0f Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Wed, 22 Aug 2018 11:24:55 -0400
Subject: [PATCH 25/25] Update translations

---
 share/translations/keepassx_ar.ts    |    8 +-
 share/translations/keepassx_bn.ts    |   50 +-
 share/translations/keepassx_cs.ts    |   26 +-
 share/translations/keepassx_de.ts    |    4 +-
 share/translations/keepassx_en.ts    |   21 +-
 share/translations/keepassx_fr.ts    |  479 ++-
 share/translations/keepassx_lt.ts    |   50 +-
 share/translations/keepassx_pl.ts    |    2 +-
 share/translations/keepassx_sk.ts    | 4123 ++++++++++++++++++++++++++
 share/translations/keepassx_sv.ts    |  251 +-
 share/translations/keepassx_tr.ts    |  721 ++---
 share/translations/keepassx_uk.ts    |  178 +-
 share/translations/keepassx_zh_CN.ts |   76 +-
 share/translations/keepassx_zh_TW.ts |    6 +-
 14 files changed, 5084 insertions(+), 911 deletions(-)
 create mode 100644 share/translations/keepassx_sk.ts

diff --git a/share/translations/keepassx_ar.ts b/share/translations/keepassx_ar.ts
index 3a0ca692d8..d532bd15a1 100644
--- a/share/translations/keepassx_ar.ts
+++ b/share/translations/keepassx_ar.ts
@@ -605,7 +605,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Fields are separated by</source>
-        <translation type="unfinished"/>
+        <translation>تُفصل الحقول بواسطة</translation>
     </message>
     <message>
         <source>Comments start with</source>
@@ -1949,11 +1949,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <translation>ﻻئم النافذة</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <translation>ﻻئم المحتوى</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
@@ -3891,7 +3891,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     <name>SettingsWidgetSecurity</name>
     <message>
         <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <translation>مهلة نفاد الوقت</translation>
     </message>
     <message>
         <source>Clear clipboard after</source>
diff --git a/share/translations/keepassx_bn.ts b/share/translations/keepassx_bn.ts
index 344e6864f3..1996cb58d9 100644
--- a/share/translations/keepassx_bn.ts
+++ b/share/translations/keepassx_bn.ts
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Debug Info</source>
-        <translation type="unfinished"/>
+        <translation>ডিবাগ তথ্য</translation>
     </message>
     <message>
         <source>Include the following information whenever you report a bug:</source>
@@ -2127,7 +2127,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
-        <translation type="unfinished"/>
+        <translation>শুরুতে KDF প্যারামিটারের জন্য বাফার আরাম্ভ করতে ব্যার্থ হয়েছে</translation>
     </message>
     <message>
         <source>Unsupported key derivation function (KDF) or invalid parameters</source>
@@ -2135,19 +2135,19 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
-        <translation type="unfinished"/>
+        <translation>KDBX4 ফাইলে লেগাসি হেডার ফিল্ড পাওয়া গেছে</translation>
     </message>
     <message>
         <source>Invalid inner header id size</source>
-        <translation type="unfinished"/>
+        <translation>ভেতরের শিরোনামের আইডি সাইজ সঠিক নয়</translation>
     </message>
     <message>
         <source>Invalid inner header field length</source>
-        <translation type="unfinished"/>
+        <translation>শিরোনামের ভেতরের আইডি  পরিমান সঠিক নয়</translation>
     </message>
     <message>
         <source>Invalid inner header binary size</source>
-        <translation type="unfinished"/>
+        <translation>শিরোনামের ভেতরের আইডি বাইনারি সাইজ সঠিক নয়</translation>
     </message>
     <message>
         <source>Unsupported KeePass variant map version.</source>
@@ -2275,7 +2275,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"/>
+        <translation>KeePass ডাটাবেস নয়</translation>
     </message>
     <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
@@ -2432,7 +2432,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation type="unfinished"/>
+        <translation>KeePass ডাটাবেস নয়</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -2846,19 +2846,19 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>read-only</source>
-        <translation type="unfinished"/>
+        <translation>শুধুমাত্র পাঠযোগ্য</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>সেটিংস</translation>
     </message>
     <message>
         <source>Toggle window</source>
-        <translation type="unfinished"/>
+        <translation>উইন্ডো পরিবর্তন</translation>
     </message>
     <message>
         <source>Quit KeePassXC</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC বন্ধ করুন</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
@@ -2874,7 +2874,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Save repaired database</source>
-        <translation type="unfinished"/>
+        <translation>মেরামতকৃত ডাটাবেস সংরক্ষন করুন</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
@@ -2882,13 +2882,15 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Please touch the button on your YubiKey!</source>
-        <translation type="unfinished"/>
+        <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"/>
+        <translation>সতর্কীকরণ: আপনি একটি আনস্টেবল ভার্সনের KeePassXC ব্যবহার করছেন।
+সমস্যা হবার উচ্চ ঝুঁকি আছে, আপনার ডাটাবেস ব্যাকআপ রাখুন।
+-এই সংস্করণ নিয়মিত ব্যবহারের জন্য বানানো হয়নি।</translation>
     </message>
 </context>
 <context>
@@ -2907,7 +2909,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation type="unfinished"/>
+        <translation>কী ফাইল খুবই ছোট</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
@@ -2915,11 +2917,11 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Found zero keys</source>
-        <translation type="unfinished"/>
+        <translation>কোন কী খুজে পাওয়া যায়নি</translation>
     </message>
     <message>
         <source>Failed to read public key.</source>
-        <translation type="unfinished"/>
+        <translation>পাবলিক কী পড়তে ব্যর্থ হয়েছে।</translation>
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
@@ -3196,7 +3198,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"/>
+        <translation>গ্রহণ</translation>
     </message>
     <message>
         <source>Close</source>
@@ -3204,7 +3206,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Apply</source>
-        <translation type="unfinished"/>
+        <translation>প্রয়োগ করুন</translation>
     </message>
     <message>
         <source>Entropy: %1 bit</source>
@@ -3217,22 +3219,22 @@ Using default port 19455.</source>
     <message>
         <source>Poor</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"/>
+        <translation>নিম্নমানের</translation>
     </message>
     <message>
         <source>Weak</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"/>
+        <translation>দূর্বল</translation>
     </message>
     <message>
         <source>Good</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"/>
+        <translation>ভাল</translation>
     </message>
     <message>
         <source>Excellent</source>
         <comment>Password quality</comment>
-        <translation type="unfinished"/>
+        <translation>খুব ভাল</translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_cs.ts b/share/translations/keepassx_cs.ts
index bd9cbc2b2f..5520774abc 100644
--- a/share/translations/keepassx_cs.ts
+++ b/share/translations/keepassx_cs.ts
@@ -448,7 +448,7 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation><numerusform>%n šifrovací klíč úspěšně odebrán z nastavení KeePassXC.</numerusform><numerusform>%n šifrovací klíče úspěšně odebrány z nastavení KeePassXC.</numerusform><numerusform>%n šifrovacích klíčů úspěšně odebráno z nastavení KeePassXC.</numerusform></translation>
+        <translation><numerusform>%n šifrovací klíč úspěšně odebrán z nastavení KeePassXC.</numerusform><numerusform>%n šifrovací klíče úspěšně odebrány z nastavení KeePassXC.</numerusform><numerusform>%n šifrovacích klíčů úspěšně odebráno z nastavení KeePassXC.</numerusform><numerusform>%n šifrovacích klíčů úspěšně odebráno z nastavení KeePassXC.</numerusform></translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
@@ -464,7 +464,7 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
     </message>
     <message numerus="yes">
         <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></translation>
+        <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>Z %n položek úspěšně odebrána oprávnění.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -692,15 +692,15 @@ Zvažte vytvoření nového souboru s klíčem.</translation>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n byte(s), </source>
-        <translation><numerusform>%n bajt</numerusform><numerusform>%n bajty</numerusform><numerusform>%n bajtů</numerusform></translation>
+        <translation><numerusform>%n bajt</numerusform><numerusform>%n bajty</numerusform><numerusform>%n bajtů</numerusform><numerusform>%n bajtů</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s), </source>
-        <translation><numerusform>%n řádek</numerusform><numerusform>%n řádky</numerusform><numerusform>%n řádků</numerusform></translation>
+        <translation><numerusform>%n řádek</numerusform><numerusform>%n řádky</numerusform><numerusform>%n řádků</numerusform><numerusform>%n řádků</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation><numerusform>%n sloupec</numerusform><numerusform>%n sloupce</numerusform><numerusform>%n sloupců</numerusform></translation>
+        <translation><numerusform>%n sloupec</numerusform><numerusform>%n sloupce</numerusform><numerusform>%n sloupců</numerusform><numerusform>%n sloupců</numerusform></translation>
     </message>
 </context>
 <context>
@@ -859,12 +859,12 @@ Pokud tento počet ponecháte, může být velmi snadné prolomit šifrování v
     <message numerus="yes">
         <source> MiB</source>
         <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform> MiB</numerusform><numerusform> MiB</numerusform><numerusform> MiB</numerusform></translation>
+        <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></translation>
+        <translation><numerusform>vlákno</numerusform><numerusform>vlákna</numerusform><numerusform>vláken</numerusform><numerusform>vláken</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1121,7 +1121,7 @@ Vypnout bezpečné ukládání a zkusit to znovu?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <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></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>
@@ -1369,11 +1369,11 @@ Přejete si je sloučit?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
+        <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform><numerusform>%n týdnů</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform></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>
@@ -1817,7 +1817,7 @@ Dotčený zásuvný modul to může rozbít.</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <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></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>
@@ -3719,7 +3719,7 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</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></translation>
+        <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>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -3751,7 +3751,7 @@ Buď jí odemkněte, nebo vyberte jinou, odemčenou.</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í ze %n položek.</numerusform></translation>
+        <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í ze %n položek.</numerusform><numerusform>Úspěšně odebrána oprávnění ze %n položek.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts
index 47665d9c05..927f2878e5 100644
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@@ -1803,7 +1803,7 @@ Dies kann dazu führen, dass die jeweiligen Plugins nicht mehr richtig funktioni
     </message>
     <message>
         <source>Open</source>
-        <translation>Offen</translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
@@ -2776,7 +2776,7 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation>Datenbank &amp;sperren</translation>
+        <translation>Datenbanken &amp;sperren</translation>
     </message>
     <message>
         <source>&amp;Title</source>
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
index 2666d8e913..a0e1b99b23 100644
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -373,6 +373,10 @@ 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"></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>
+    </message>
 </context>
 <context>
     <name>BrowserService</name>
@@ -2738,10 +2742,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <source>&amp;Clone entry</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Copy &amp;username</source>
         <translation type="unfinished"></translation>
@@ -2892,6 +2892,19 @@ 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>
     </message>
+    <message>
+        <source>&amp;Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Report a &amp;bug</source>
+        <translation type="unfinished"></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>
+    </message>
 </context>
 <context>
     <name>OpenSSHKey</name>
diff --git a/share/translations/keepassx_fr.ts b/share/translations/keepassx_fr.ts
index da1b14eda1..202d6c7b8a 100644
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
@@ -11,11 +11,11 @@
     </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>Signaler les bugs sur &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>Signalez les bogues sur &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 est distribué suivant les termes de la GNU Licence Publique Générale (GNU GPL) version 2 ou version 3 de la licence (à votre choix).</translation>
+        <translation>KeePassXC est distribué suivant les conditions de la licence publique générale GNU (GNU GPL) version 2 ou version 3 de la licence (facultativement).</translation>
     </message>
     <message>
         <source>Contributors</source>
@@ -31,11 +31,11 @@
     </message>
     <message>
         <source>Include the following information whenever you report a bug:</source>
-        <translation>Inclure les informations suivantes lorsque vous signalez un bug :</translation>
+        <translation>Inclure les informations suivantes chaque fois que vous signalez un bogue :</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation>Copier dans le presse-papier</translation>
+        <translation>Copier dans le presse-papiers</translation>
     </message>
     <message>
         <source>Version %1
@@ -53,7 +53,7 @@
     </message>
     <message>
         <source>Libraries:</source>
-        <translation>Bibliothèques :</translation>
+        <translation>Bibliothèques :</translation>
     </message>
     <message>
         <source>Operating system: %1
@@ -73,7 +73,7 @@ Noyau : %3 %4</translation>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation>L’équipe de KeePassXC remercie tout particulièrement debfx pour la conception de KeePassX.</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
@@ -86,11 +86,11 @@ Noyau : %3 %4</translation>
     <name>AccessControlDialog</name>
     <message>
         <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Accès KeePassXC HTTP confirmé</translation>
+        <translation>Confirmer l’accès à KeePassXC HTTP</translation>
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation>Se souvenir de ce choix</translation>
+        <translation>Mémoriser ce choix</translation>
     </message>
     <message>
         <source>Allow</source>
@@ -130,19 +130,19 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>La syntaxe de votre séquence de saisie automatique est incorrecte.</translation>
+        <translation>La syntaxe de votre instruction de saisie automatique est incorrecte !</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Cette commande de saisie automatique contient un délai très long. Voulez-vous continuer ?</translation>
+        <translation>Cette commande de saisie automatique contient un délai très long. Voulez-vous vraiment continuer ?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Cette commande de saisie automatique contient des touches très lentes. Voulez-vous continuer ?</translation>
+        <translation>Cette commande de saisie automatique contient des touches très lentes. Voulez-vous vraiment continuer ?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Cette commande de saisie automatique contient des arguments souvent répétés. Voulez-vous continuer ?</translation>
+        <translation>Cette commande de saisie automatique contient des arguments répétés très souvent. Voulez-vous vraiment continuer ?</translation>
     </message>
 </context>
 <context>
@@ -194,11 +194,11 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation>Confirmer l’accès pour KeePassXC-Browser</translation>
+        <translation>Confirmer l’accès à KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation>Se souvenir de ce choix</translation>
+        <translation>Mémoriser ce choix</translation>
     </message>
     <message>
         <source>Allow</source>
@@ -211,7 +211,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</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 a demandé l’accès aux mots de passe pour le ou les élément(s) suivant(s).
+        <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>
     </message>
 </context>
@@ -227,7 +227,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation>Activer l’intégration de KeePassXC au sein du navigateur web</translation>
+        <translation>Activer l’intégration de KeePassXC aux navigateurs</translation>
     </message>
     <message>
         <source>General</source>
@@ -235,11 +235,11 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Enable integration for these browsers:</source>
-        <translation>Activer l’intégration avec ces navigateurs web :</translation>
+        <translation>Activer l’intégration pour ces navigateurs :</translation>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
-        <translation>&amp;Google Chrome</translation>
+        <translation>Chrome de &amp;Google</translation>
     </message>
     <message>
         <source>&amp;Firefox</source>
@@ -272,7 +272,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Renvoie seulement les meilleures correspondances pour une URL spécifique au lieu des entrées pour tout le domaine.</translation>
+        <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 credentials</source>
@@ -290,7 +290,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>&amp;Disconnect all browsers</source>
-        <translation>&amp;Déconnecter tous les navigateurs web</translation>
+        <translation>&amp;Déconnecter tous les navigateurs</translation>
     </message>
     <message>
         <source>Forget all remembered &amp;permissions</source>
@@ -329,11 +329,11 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation>Mises à jour du chemin du fichier binaire de KeePassXC ou de keepassxc-proxy dans les scripts Native Messaging automatiquement au démarrage.</translation>
+        <translation>Met automatiquement à jour le chemin des exécutables KeePassXC ou keepassxc-proxy vers les scripts de messagerie native lors du démarrage.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation>Mise à jour des fichiers manifest &amp;Native Messaging au démarrage</translation>
+        <translation>Mettre à jour les fichiers de manifeste de la &amp;messagerie native lors du démarrage</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
@@ -359,7 +359,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</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>
+        <translation>&lt;b&gt;Avertissement :&lt;/b&gt; Les options suivantes peuvent être dangereuses !</translation>
     </message>
     <message>
         <source>Executable Files (*.exe);;All Files (*.*)</source>
@@ -382,7 +382,7 @@ Veuillez indiquer si vous souhaitez autoriser l’accès.</translation>
     <name>BrowserService</name>
     <message>
         <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC : nouvelle demande d’association</translation>
+        <translation>KeePassXC : Nouvelle demande d’association de touche</translation>
     </message>
     <message>
         <source>You have received an association request for the above key.
@@ -400,43 +400,43 @@ attribuez lui un nom unique pour l’identifier et acceptez la.</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC : Écraser la clé existante ?</translation>
+        <translation>KeePassXC : Remplacer la clé existante ?</translation>
     </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 avec le nom « %1 » existe déjà.
-Voulez-vous l’écraser ?</translation>
+        <translation>Une clé de chiffrement partagée portant le nom « %1 » existe déjà.
+Voulez-vous la remplacer ?</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC : Mettre à jour l’entrée</translation>
+        <translation>KeePassXC : Mettre l’entrée à jour</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Voulez-vous mettre à jour l’information dans %1 - %2 ?</translation>
+        <translation>Voulez-vous mettre à jour les informations dans %1 - %2 ?</translation>
     </message>
     <message>
         <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC : Base de données verrouillée !</translation>
+        <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 actuelle est verrouillée !
-Veuillez déverrouiller la base de données sélectionnée, ou choisir une base de données déverrouillée. </translation>
+        <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 : Paramètres indisponibles !</translation>
+        <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 actuelle ne contient pas d’entrée pour les paramètres.</translation>
+        <translation>La base de données active ne contient pas d’entrée pour les paramètres.</translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC : Aucune clé trouvée</translation>
+        <translation>KeePassXC : Aucune clé n’a été trouvée</translation>
     </message>
     <message>
         <source>No shared encryption keys found in KeePassXC Settings.</source>
@@ -444,15 +444,15 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC : Les clés ont été effacées de la base de données</translation>
+        <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>%n clé(s) de chiffrement ont été retirées 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>
+        <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>Removing stored permissions…</source>
-        <translation>Effacement des permissions enregistrées…</translation>
+        <translation>Retrait des autorisations enregistrées…</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -460,19 +460,19 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC : Permissions retirées</translation>
+        <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 permissions de %n entrée(s) ont été retirées avec succès.</numerusform><numerusform>Autorisations retirées avec succès de %s entrée(s)</numerusform></translation>
+        <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 permissions n’a été trouvée !</translation>
+        <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 actuelle ne contient pas d’entrée avec des permissions.</translation>
+        <translation>La base de données active ne contient pas d’entrée avec des autorisations.</translation>
     </message>
 </context>
 <context>
@@ -483,15 +483,15 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>Enter password:</source>
-        <translation>Entrez un mot de passe :</translation>
+        <translation>Saisir un mot de passe :</translation>
     </message>
     <message>
         <source>Repeat password:</source>
-        <translation>Confirmez le mot de passe :</translation>
+        <translation>Répéter le mot de passe :</translation>
     </message>
     <message>
         <source>&amp;Key file</source>
-        <translation>Fichier-clé</translation>
+        <translation>&amp;Fichier-clé</translation>
     </message>
     <message>
         <source>Browse</source>
@@ -507,7 +507,7 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Rafraîchir</translation>
+        <translation>Actualiser</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -523,11 +523,11 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>Unable to create Key File : </source>
-        <translation>Impossible de créer un fichier-clé :</translation>
+        <translation>Impossible de créer un fichier-clé :</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation>Choisir un fichier-clé</translation>
+        <translation>Sélectionner un fichier-clé</translation>
     </message>
     <message>
         <source>Empty password</source>
@@ -535,7 +535,7 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     </message>
     <message>
         <source>Do you really want to use an empty string as password?</source>
-        <translation>Voulez-vous vraiment utiliser une chaîne vide comme mot de passe ?</translation>
+        <translation>Voulez-vous vraiment laisser vide le champ de mot de passe ?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -544,26 +544,25 @@ Veuillez déverrouiller la base de données sélectionnée, ou choisir une base
     <message>
         <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>Impossible de définir %1 comme fichier-clé :
+        <translation>Échec de définition de %1 comme fichier-clé :
 %2</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Ancien format de fichier-clé</translation>
+        <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 consider generating a new key file.</source>
-        <translation>Vous utilisez un ancien format de fichier-clé,
-qui peut ne plus être pris en charge à l’avenir.
+        <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>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Échec du changement de clé maître: aucune YubiKey insérée.</translation>
+        <translation>Échec de changement de clé maîtresse : aucune YubiKey n’est insérée.</translation>
     </message>
 </context>
 <context>
@@ -633,7 +632,7 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Prévisualisation</translation>
+        <translation>Aperçu</translation>
     </message>
     <message>
         <source>Column layout</source>
@@ -661,7 +660,7 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file !</source>
-        <translation>Erreur(s) détectées dans le fichier CSV !</translation>
+        <translation>Des erreurs ont été détectées dans le fichier CSV !</translation>
     </message>
     <message>
         <source> more messages skipped]</source>
@@ -686,37 +685,37 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n byte(s), </source>
-        <translation><numerusform>%n octet(s), </numerusform><numerusform>%n octet(s), </numerusform></translation>
+        <translation><numerusform>%n octet, </numerusform><numerusform>%n octets, </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s), </source>
-        <translation><numerusform>%n ligne(s), </numerusform><numerusform>%n rangée(s), </numerusform></translation>
+        <translation><numerusform>%n ligne, </numerusform><numerusform>%n lignes, </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation><numerusform>%n colonne(s)</numerusform><numerusform>%n colonne(s)</numerusform></translation>
+        <translation><numerusform>%n colonne</numerusform><numerusform>%n colonnes</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
-        <translation>Entrez la clé maître</translation>
+        <translation>Saisir la clé maîtresse</translation>
     </message>
     <message>
         <source>Key File:</source>
-        <translation>Fichier-clé :</translation>
+        <translation>Fichier-clé :</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de passe :</translation>
+        <translation>Mot de passe :</translation>
     </message>
     <message>
         <source>Browse</source>
@@ -724,11 +723,11 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Rafraîchir</translation>
+        <translation>Actualiser</translation>
     </message>
     <message>
         <source>Challenge Response:</source>
-        <translation>Challenge-réponse :</translation>
+        <translation>Question-réponse :</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
@@ -740,15 +739,14 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation>Ancien format de fichier-clé</translation>
+        <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 consider generating a new key file.</source>
-        <translation>Vous utilisez un ancien format de fichier-clé
-qui peut ne plus être pris en charge à l’avenir.
+        <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>
     </message>
@@ -766,7 +764,7 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     </message>
     <message>
         <source>Select key file</source>
-        <translation>Choisissez un fichier-clé</translation>
+        <translation>Sélectionner un fichier-clé</translation>
     </message>
 </context>
 <context>
@@ -798,8 +796,8 @@ Veuillez envisager de générer un nouveau fichier-clé.</translation>
     <message>
         <source>The database has been successfully repaired
 You can now save it.</source>
-        <translation>La base de données a correctement été réparée.
-Vous pouvez maintenant la sauvegarder.</translation>
+        <translation>La base de données a été réparée avec succès.
+Vous pouvez maintenant l’enregistrer.</translation>
     </message>
     <message>
         <source>Unable to repair the database.</source>
@@ -825,9 +823,9 @@ Vous pouvez maintenant la sauvegarder.</translation>
         <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 tours de transformation de clé avec Argon2.
+        <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 peut prendre des heures, des jours (voire plus) à s’ouvrir !</translation>
+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>
@@ -846,9 +844,9 @@ Si vous conservez ce nombre, votre base de données peut prendre des heures, des
         <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 faible nombre de tours de transformation de clé avec AES-KDF.
+        <translation>Vous utilisez un très petit nombre de cycles de transformation de clé avec AES-KDF.
 
-Si vous conservez ce nombre, la sécurité de votre base de données pourrait être trop facilement cassée !</translation>
+Si vous conservez ce nombre, votre base de données pourrait être craquées trop facilement !</translation>
     </message>
     <message>
         <source>KDF unchanged</source>
@@ -866,7 +864,7 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     <message numerus="yes">
         <source> thread(s)</source>
         <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation><numerusform>fil(s) d’exécution</numerusform><numerusform>fil(s) d’exécution</numerusform></translation>
+        <translation><numerusform> fil d’exécution</numerusform><numerusform> fils d’exécution</numerusform></translation>
     </message>
 </context>
 <context>
@@ -877,11 +875,11 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
-        <translation>AES : 256 bits (par défaut)</translation>
+        <translation>AES : 256 bits (par défaut)</translation>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
-        <translation>Twofish : 256 bits</translation>
+        <translation>Twofish : 256 bits</translation>
     </message>
     <message>
         <source>Key Derivation Function:</source>
@@ -889,7 +887,7 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Transform rounds:</source>
-        <translation>Tours de transformation :</translation>
+        <translation>Cycles de transformation :</translation>
     </message>
     <message>
         <source>Benchmark 1-second delay</source>
@@ -897,7 +895,7 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Memory Usage:</source>
-        <translation>Utilisation mémoire :</translation>
+        <translation>Utilisation de la mémoire :</translation>
     </message>
     <message>
         <source>Parallelism:</source>
@@ -928,11 +926,11 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Max. history items:</source>
-        <translation>Nombre maximal d’éléments dans l’historique :</translation>
+        <translation>Nombre maximal d’éléments d’historique :</translation>
     </message>
     <message>
         <source>Max. history size:</source>
-        <translation>Taille maximale de l’historique :</translation>
+        <translation>Taille maximale de l’historique :</translation>
     </message>
     <message>
         <source> MiB</source>
@@ -944,11 +942,11 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation>Paramètres de base de données supplémentaires</translation>
+        <translation>Paramètres supplémentaires de base de données</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
-        <translation>Activers la &amp;compression (recommandé)</translation>
+        <translation>Activer la &amp;compression (recommandé)</translation>
     </message>
 </context>
 <context>
@@ -972,7 +970,7 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>File not found!</source>
-        <translation>Fichier introuvable !</translation>
+        <translation>Le fichier est introuvable !</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
@@ -996,7 +994,7 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Merge database</source>
-        <translation>Fusionner les bases de données</translation>
+        <translation>Fusionner la base de données</translation>
     </message>
     <message>
         <source>Open KeePass 1 database</source>
@@ -1008,23 +1006,23 @@ Si vous conservez ce nombre, la sécurité de votre base de données pourrait ê
     </message>
     <message>
         <source>Close?</source>
-        <translation>Fermer ?</translation>
+        <translation>Fermer ?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; is in edit mode.
 Discard changes and close anyway?</source>
-        <translation>« %1 » est en mode édition.
-Abandonner les changements et fermer ?</translation>
+        <translation>« %1 » est en mode édition.
+Ignorer les changements et fermer quand même ?</translation>
     </message>
     <message>
         <source>Save changes?</source>
-        <translation>Enregistrer les modifications ?</translation>
+        <translation>Enregistrer les changements ?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
 Save changes?</source>
-        <translation>« %1 » a été modifié.
-Enregistrer les modifications ?</translation>
+        <translation>« %1 » a été modifié.
+Enregistrer les changements ?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
@@ -1036,7 +1034,7 @@ Enregistrer les modifications ?</translation>
     </message>
     <message>
         <source>Save database as</source>
-        <translation>Enregistrer comme nouvelle base de données</translation>
+        <translation>Enregistrer la base de données sous</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
@@ -1061,26 +1059,26 @@ Enregistrer les modifications ?</translation>
     <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 modifications.
-Cliquez sur Annuler pour finir vos modifications ou abandonnez-les.</translation>
+        <translation>Impossible de verrouiller la base de données lors de changements.
+Cliquez sur Annuler pour finir vos changements ou abandonnez-les.</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>La base de données a été modifiée.
-Voulez-vous l’enregistrer avant de la verrouiller ?
-Autrement, vos modifications seront perdues.</translation>
+        <translation>Cette base de données a été modifiée.
+Voulez-vous l’enregistrer avant de la verrouiller ?
+Autrement, vos changements seront perdus</translation>
     </message>
     <message>
         <source>Disable safe saves?</source>
-        <translation>Désactiver les sauvegardes sécurisées ?</translation>
+        <translation>Désactiver les enregistrements sécurisé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 les services de synchronisation de fichiers qui maintiennent un verrou sur le fichier sauvegardé.
-Désactiver les sauvegardes sécurisées et essayer à nouveau ?</translation>
+        <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>
 </context>
 <context>
@@ -1091,47 +1089,47 @@ Désactiver les sauvegardes sécurisées et essayer à nouveau ?</translation>
     </message>
     <message>
         <source>Change master key</source>
-        <translation>Changer la clé maître</translation>
+        <translation>Changer la clé maîtresse</translation>
     </message>
     <message>
         <source>Delete entry?</source>
-        <translation>Supprimer l’entrée ?</translation>
+        <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 supprimer l’entrée « %1 » définitivement ?</translation>
+        <translation>Voulez-vous vraiment supprimer définitivement l’entrée « %1 » ?</translation>
     </message>
     <message>
         <source>Delete entries?</source>
-        <translation>Supprimer les entrées ?</translation>
+        <translation>Supprimer les entrées ?</translation>
     </message>
     <message>
         <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Voulez-vous supprimer %1 entrées définitivement ?</translation>
+        <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 dans la corbeille ?</translation>
+        <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>Êtes-vous sûr de vouloir déplacer l’entrée « %1 » dans la corbeille ?</translation>
+        <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>
+        <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 déplacer %n entrée(s) vers la corbeille ?</numerusform><numerusform>Voulez-vous déplacer %n entrée(s) vers la corbeille ?</numerusform></translation>
+        <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>
     </message>
     <message>
         <source>Execute command?</source>
-        <translation>Exécuter la commande ?</translation>
+        <translation>Exécuter la commande ?</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>Voulez-vous vraiment exécuter la commande suivante ?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <translation>Voulez-vous vraiment exécuter la commande suivante ?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
         <source>Remember my choice</source>
@@ -1139,15 +1137,15 @@ Désactiver les sauvegardes sécurisées et essayer à nouveau ?</translation>
     </message>
     <message>
         <source>Delete group?</source>
-        <translation>Supprimer le groupe ?</translation>
+        <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 supprimer le groupe « %1 » définitivement ?</translation>
+        <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ître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -1171,7 +1169,7 @@ Désactiver les sauvegardes sécurisées et essayer à nouveau ?</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Le fichier de la base de données à été modifié. Voulez-vous charger les changements ?</translation>
+        <translation>Le fichier de la base de données a été modifiée. Voulez-vous charger les changements ?</translation>
     </message>
     <message>
         <source>Merge Request</source>
@@ -1180,8 +1178,8 @@ Désactiver les sauvegardes sécurisées et essayer à nouveau ?</translation>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
-        <translation>Le fichier de la base de données a été modifié et les changements que vous avez effectué n’ont pas été enregistrés.
-Voulez-vous fusionner vos modifications ?</translation>
+        <translation>Le fichier de la base de données a été modifiée et vos changements ne sont pas enregistrés.
+Voulez-vous fusionner vos changements ?</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -1189,11 +1187,11 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
-        <translation>Vider la corbeille ?</translation>
+        <translation>Vider la corbeille ?</translation>
     </message>
     <message>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>Êtes-vous certain de vouloir vider définitivement votre corbeille ?</translation>
+        <translation>Êtes-vous certain de vouloir vider définitivement la corbeille ?</translation>
     </message>
 </context>
 <context>
@@ -1240,7 +1238,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Fichiers attachés</translation>
+        <translation>Pièces jointes</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1323,7 +1321,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation>Fichier trop lourd pour être un fichier-clé</translation>
+        <translation>Le fichier est trop gros pour être un fichier-clé</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
@@ -1355,7 +1353,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
-        <translation>Êtes-vous sûr de vouloir supprimer cet attribut?</translation>
+        <translation>Êtes-vous certain de vouloir supprimer cet attribut ?</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
@@ -1371,7 +1369,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semaine(s)</numerusform><numerusform>%n semaine(s)</numerusform></translation>
+        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
@@ -1383,11 +1381,11 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Apply generated password?</source>
-        <translation>Appliquer le mot de passe généré ?</translation>
+        <translation>Appliquer le mot de passe généré ?</translation>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation>Souhaitez-vous appliquer le mot de passe généré à cette entrée ?</translation>
+        <translation>Voulez-vous appliquer le mot de passe généré à cette entrée ?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
@@ -1422,15 +1420,15 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Affichage</translation>
+        <translation>Pièces jointes</translation>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation>Couleur du texte :</translation>
+        <translation>Couleur du texte :</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation>Couleur du fond :</translation>
+        <translation>Couleur de l’arrière-plan :</translation>
     </message>
 </context>
 <context>
@@ -1465,7 +1463,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Use a specific sequence for this association:</source>
-        <translation>Utilisez une séquence spécifique pour cette association :</translation>
+        <translation>Utilisez une séquence précise pour cette association :</translation>
     </message>
 </context>
 <context>
@@ -1495,11 +1493,11 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de passe :</translation>
+        <translation>Mot de passe :</translation>
     </message>
     <message>
         <source>Repeat:</source>
-        <translation>Confirmation :</translation>
+        <translation>Confirmation :</translation>
     </message>
     <message>
         <source>Title:</source>
@@ -1570,7 +1568,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
-        <translation>Copier dans le presse-papier</translation>
+        <translation>Copier dans le presse-papiers</translation>
     </message>
     <message>
         <source>Private key</source>
@@ -1587,7 +1585,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation>Fichier attaché</translation>
+        <translation>Pièce jointe</translation>
     </message>
     <message>
         <source>Add to agent</source>
@@ -1696,7 +1694,7 @@ Voulez-vous fusionner vos modifications ?</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 tant que secours sous Outils&gt;Paramètres&gt;Sécurité</translation>
+        <translation>Astuce : Vous pouvez activer Google comme second recours sous Outils &gt; Paramètres &gt; Sécurité</translation>
     </message>
     <message>
         <source>Images</source>
@@ -1724,7 +1722,7 @@ Voulez-vous fusionner vos modifications ?</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ée(s) et sera remplacée par l’icône par défaut. Êtes-vous sûr de vouloir l’effacer ?</translation>
+        <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>
     </message>
 </context>
 <context>
@@ -1747,7 +1745,7 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation>Données de l’extension</translation>
+        <translation>Données d’extension</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -1755,12 +1753,12 @@ Voulez-vous fusionner vos modifications ?</translation>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation>Supprimer les données de l’extension ?</translation>
+        <translation>Supprimer les données d’extension ?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
 This may cause the affected plugins to malfunction.</source>
-        <translation>Souhaitez-vous vraiment supprimer les données de l’extension sélectionnée ? Cela peut causer un dysfonctionnement de l’extension.</translation>
+        <translation>Voulez-vous vraiment supprimer les données d’extension sélectionnées ? Cela peut entraîner un dysfonctionnement des extensions touchées.</translation>
     </message>
     <message>
         <source>Key</source>
@@ -1814,11 +1812,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Select files</source>
-        <translation>Sélectionner fichier(s)</translation>
+        <translation>Sélectionner des fichiers</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>Êtes-vous sûr de vouloir supprimer ces %n fichiers attachés ?</numerusform><numerusform>Êtes-vous sûr de vouloir supprimer ces %n fichiers attachés ?</numerusform></translation>
+        <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>
@@ -1826,7 +1824,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation>Enregistrer les fichiers attachés</translation>
+        <translation>Enregistrer les pièces jointes</translation>
     </message>
     <message>
         <source>Unable to create directory:
@@ -1836,28 +1834,28 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
-        <translation>Êtes-vous sûr de vouloir écraser le fichier « %1 » par ce fichier attaché ?</translation>
+        <translation>Êtes-vous certain de vouloir remplacer le fichier existant « %1 » par la pièce jointe ?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
-        <translation>Confirmer l’écrasement</translation>
+        <translation>Confirmer le remplacement</translation>
     </message>
     <message>
         <source>Unable to save attachments:
 %1</source>
-        <translation>Impossible d’enregistrer les fichiers attachés :
+        <translation>Impossible d’enregistrer les pièces jointes :
 %1</translation>
     </message>
     <message>
         <source>Unable to open attachment:
 %1</source>
-        <translation>Impossible d’ouvrir le fichier attaché :
+        <translation>Impossible d’ouvrir la pièce jointe :
 %1</translation>
     </message>
     <message>
         <source>Unable to open attachments:
 %1</source>
-        <translation>Impossible d’ouvrir les fichiers attachés :
+        <translation>Impossible d’ouvrir les pièces jointes :
 %1</translation>
     </message>
     <message>
@@ -1946,7 +1944,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Fichiers attachés</translation>
+        <translation>Pièces jointes</translation>
     </message>
 </context>
 <context>
@@ -1991,11 +1989,11 @@ This may cause the affected plugins to malfunction.</source>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation>KeePassXC : Impossible d’enregistrer le fichier!</translation>
+        <translation>KeePassXC : Impossible d’enregistrer le fichier !</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
-        <translation>Impossible de sauvegarder le fichier du script Native Messaging.</translation>
+        <translation>Impossible d’enregistrer le fichier de script de la messagerie native</translation>
     </message>
 </context>
 <context>
@@ -2068,37 +2066,37 @@ This may cause the affected plugins to malfunction.</source>
     <name>Kdbx3Reader</name>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation>Impossible de lancer un challenge-réponse.</translation>
+        <translation>Impossible de lancer une question-réponse.</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
-        <translation>La clé est incorrecte, ou bien la base de données est corrompue.</translation>
+        <translation>La clé n’est pas la bonne ou le fichier de base de données est corrompu.</translation>
     </message>
 </context>
 <context>
     <name>Kdbx3Writer</name>
     <message>
         <source>Unable to issue challenge-response.</source>
-        <translation>Impossible de lancer un challenge-réponse.</translation>
+        <translation>Impossible de lancer une question-réponse.</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
 </context>
 <context>
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation>En-têtes de base de données manquants</translation>
+        <translation>les en-têtes de la base de données manquent</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
     <message>
         <source>Invalid header checksum size</source>
@@ -2110,7 +2108,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
-        <translation>Mauvaise clé ou fichier de base de données corrompu. (HMAC ne correspond pas)</translation>
+        <translation>La clé n’est pas la bonne ou le fichier de base de données est corrompu (non-correspondance HMAC).</translation>
     </message>
     <message>
         <source>Unknown cipher</source>
@@ -2226,7 +2224,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
     <message>
         <source>Failed to serialize KDF parameters variant map</source>
@@ -2262,7 +2260,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid transform rounds size</source>
-        <translation>Taille des tours de transformation invalide</translation>
+        <translation>La taille de cycles de transformation est invalide</translation>
     </message>
     <message>
         <source>Invalid start bytes size</source>
@@ -2379,7 +2377,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Duplicate attachment found</source>
-        <translation>Dupliquer le fichier attaché trouvé</translation>
+        <translation>Une pièce a été trouvée en double</translation>
     </message>
     <message>
         <source>Entry binary key or value missing</source>
@@ -2463,7 +2461,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Invalid content hash size</source>
-        <translation>Taille du hachage du contenu invalide</translation>
+        <translation>La taille de l’empreinte numérique du contenu est invalide</translation>
     </message>
     <message>
         <source>Invalid transform seed size</source>
@@ -2471,7 +2469,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Invalid number of transform rounds</source>
-        <translation>Nombre de tours de transformation invalide</translation>
+        <translation>Le nombre de cycles de transformation est invalide</translation>
     </message>
     <message>
         <source>Unable to construct group tree</source>
@@ -2483,11 +2481,11 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <translation>Impossible de calculer la clé maîtresse</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
-        <translation>Clé incorrecte ou la base de données est corrompue.</translation>
+        <translation>La clé n’est pas la bonne ou le fichier de base de données est corrompu.</translation>
     </message>
     <message>
         <source>Key transformation failed</source>
@@ -2586,15 +2584,15 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     <name>KeePass2</name>
     <message>
         <source>AES: 256-bit</source>
-        <translation>AES : 256 bits</translation>
+        <translation>AES : 256 bits</translation>
     </message>
     <message>
         <source>Twofish: 256-bit</source>
-        <translation>Twofish : 256 bits</translation>
+        <translation>Twofish : 256 bits</translation>
     </message>
     <message>
         <source>ChaCha20: 256-bit</source>
-        <translation>ChaCha20 : 256 bits</translation>
+        <translation>ChaCha20 : 256 bits</translation>
     </message>
     <message>
         <source>AES-KDF (KDBX 4)</source>
@@ -2656,7 +2654,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copier l’attribut dans le presse-papier</translation>
+        <translation>Copier l’att&amp;ribut dans le presse-papiers</translation>
     </message>
     <message>
         <source>Time-based one-time password</source>
@@ -2728,7 +2726,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Change &amp;master key...</source>
-        <translation>Changer la clé &amp;maître…</translation>
+        <translation>Changer la clé &amp;maîtresse…</translation>
     </message>
     <message>
         <source>&amp;Database settings</source>
@@ -2752,7 +2750,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy username to clipboard</source>
-        <translation>Copier le nom d’utilisateur dans le presse-papier</translation>
+        <translation>Copier le nom d’utilisateur dans le presse-papiers</translation>
     </message>
     <message>
         <source>Cop&amp;y password</source>
@@ -2760,7 +2758,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy password to clipboard</source>
-        <translation>Copier le mot de passe dans le presse-papier</translation>
+        <translation>Copier le mot de passe dans le presse-papiers</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
@@ -2788,7 +2786,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy title to clipboard</source>
-        <translation>Copier le titre dans le presse-papier</translation>
+        <translation>Copier le titre dans le presse-papiers</translation>
     </message>
     <message>
         <source>&amp;URL</source>
@@ -2796,7 +2794,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy URL to clipboard</source>
-        <translation>Copier l’URL dans le presse-papier</translation>
+        <translation>Copier l’URL dans le presse-papiers</translation>
     </message>
     <message>
         <source>&amp;Notes</source>
@@ -2804,7 +2802,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Copy notes to clipboard</source>
-        <translation>Copier les notes dans le presse-papier</translation>
+        <translation>Copier les notes dans le presse-papiers</translation>
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
@@ -2848,7 +2846,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </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 au navigateur web. Cette fonctionnalité est dorénavant déconseillée et elle sera supprimée dans le futur.&lt;br&gt;Veuillez passer à KeePassXC-Browser à la place ! Si vous avez besoin d’aide pour migrer, consulter 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>
+        <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>
@@ -2880,7 +2878,7 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Save repaired database</source>
-        <translation>Sauvegarder la base de données réparée</translation>
+        <translation>Enregistrer la base de données réparée</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
@@ -2888,14 +2886,14 @@ Il s’agit d’une migration à sens unique. Vous ne pourrez pas ouvrir la base
     </message>
     <message>
         <source>Please touch the button on your YubiKey!</source>
-        <translation>Veuillez presser le bouton de votre YubiKey !</translation>
+        <translation>Veuillez appuyez sur le bouton de votre 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>AVERTISSEMENT : Vous utilisez une version instable du KeePassXC !
-Il y a un risque élevé de corruption, gardez une sauvegarde de vos bases de données.
+        <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>
 </context>
@@ -2903,7 +2901,7 @@ Cette version n’est pas destinée à la production.</translation>
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation>Fichier-clé invalide, une clé OpenSSH est attendue</translation>
+        <translation>Le fichier-clé est invalide, une clé OpenSSH est attendue</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
@@ -2915,11 +2913,11 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation>Le fichier-clé est trop petit.</translation>
+        <translation>Le fichier-clé est bien trop petit.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
-        <translation>L’identifiant magic header du fichier-clé est invalide</translation>
+        <translation>L’identifiant de l’en-tête magique du fichier-clé est invalide</translation>
     </message>
     <message>
         <source>Found zero keys</source>
@@ -2931,7 +2929,7 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation>Fichier-clé corrompu, échec de lecture de la clé privée</translation>
+        <translation>Le fichier-clé est corrompu. Échec de lecture de la clé privée.</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
@@ -2943,15 +2941,15 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
         <source>Passphrase is required to decrypt this key</source>
-        <translation>Cette clé requiert une phrase secrète pour être déchiffrée</translation>
+        <translation>Une phrase de passe est exigée pour déchiffrer cette clé</translation>
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
-        <translation>Échec de la dérivation de clé, fichier-clé corrompu?</translation>
+        <translation>Échec de dérivation de clé. Le fichier-clé est-il corrompu ?</translation>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation>Échec du déchiffrement, mauvaise phrase secrète ?</translation>
+        <translation>Échec de déchiffrement. La phrase de passe serait-elle erronée ?</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
@@ -3023,7 +3021,7 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Renvoie seulement les meilleures correspondances pour une URL spécifique au lieu des entrées pour tout le domaine.</translation>
+        <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>
@@ -3055,7 +3053,7 @@ Cette version n’est pas destinée à la production.</translation>
     </message>
     <message>
         <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Supprimer toutes les permissions enregistrées des entrées de la base de données active</translation>
+        <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>
@@ -3103,11 +3101,11 @@ Cette version n’est pas destinée à la production.</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>
+        <translation>&lt;b&gt;Avertissement :&lt;/b&gt; Les options suivantes peuvent être dangereuses !</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 est dorénavant déconseillé et il sera supprimé dans le futur.&lt;br&gt;Veuillez passer à KeePassXC-Browser à la place ! Si vous avez besoin d’aide pour migrer, consulter notre &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;guide de migration&lt;/a&gt;.&lt;/p&gt;</translation>
+        <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>
     </message>
     <message>
         <source>Cannot bind to privileged ports</source>
@@ -3116,8 +3114,8 @@ Cette version n’est pas destinée à la production.</translation>
     <message>
         <source>Cannot bind to privileged ports below 1024!
 Using default port 19455.</source>
-        <translation>Liaison impossible avec les ports privilégiés, inférieurs à 1024 !
-Restauration du port 19455 par défaut.</translation>
+        <translation>Impossible de se lier aux ports privilégiés inférieurs à 1024 !
+Le port 19455 par défaut sera utilisé.</translation>
     </message>
 </context>
 <context>
@@ -3128,7 +3126,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de passe :</translation>
+        <translation>Mot de passe :</translation>
     </message>
     <message>
         <source>strength</source>
@@ -3181,7 +3179,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Passphrase</source>
-        <translation>Phrase secrète</translation>
+        <translation>Phrase de passe</translation>
     </message>
     <message>
         <source>Wordlist:</source>
@@ -3217,7 +3215,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Entropy: %1 bit</source>
-        <translation>Entropie : %1 bit</translation>
+        <translation>Entropie : %1 bits</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
@@ -3252,7 +3250,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Database hash not available</source>
-        <translation>Hachage de la base de données non disponible</translation>
+        <translation>L’empreinte numérique de la base de données n’est pas disponible</translation>
     </message>
     <message>
         <source>Client public key not received</source>
@@ -3272,7 +3270,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
-        <translation>Chiffrement impossible du message ou clé publique introuvable. Native Messaging est-il activé dans KeePassXC ?</translation>
+        <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>
@@ -3288,7 +3286,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>No saved databases found</source>
-        <translation>Aucunes bases de données sauvegardée trouvée</translation>
+        <translation>Aucune base de données enregistrée n’a été trouvée</translation>
     </message>
     <message>
         <source>Incorrect action</source>
@@ -3364,7 +3362,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation>Copier le mot de passe d’une entrée dans le presse-papier.</translation>
+        <translation>Copier le mot de passe d’une entrée dans le presse-papiers.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -3373,7 +3371,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Timeout in seconds before clearing the clipboard.</source>
-        <translation>Expiration en secondes avant l’effacement du presse-papier.</translation>
+        <translation>Délai en secondes avant effacement du presse-papiers.</translation>
     </message>
     <message>
         <source>Edit an entry.</source>
@@ -3397,7 +3395,7 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Password for which to estimate the entropy.</source>
-        <translation>Mot de passe pour lesquels estimer l’entropie.</translation>
+        <translation>Mot de passe pour lequel estimer l’entropie.</translation>
     </message>
     <message>
         <source>Perform advanced analysis on the password.</source>
@@ -3417,15 +3415,14 @@ Restauration du port 19455 par défaut.</translation>
     </message>
     <message>
         <source>Failed to load key file %1 : %2</source>
-        <translation>Échec du chargement du fichier-clé %1 : %2</translation>
+        <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.
 
 Please consider generating a new key file.</source>
-        <translation>AVERTISSEMENT : Vous utilisez un ancien format de fichier-clé
-qui peut ne plus être pris en charge à l’avenir.
+        <translation>AVERTISSEMENT : 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>
     </message>
@@ -3477,7 +3474,7 @@ Commandes disponibles :
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
-        <translation>Fichier-clé de la base de données à fusionner.</translation>
+        <translation>Fichier-clé de la base de données à partir de laquelle fusionner.</translation>
     </message>
     <message>
         <source>Show an entry&apos;s information.</source>
@@ -3506,7 +3503,7 @@ Commandes disponibles :
     <message>
         <source>file empty !
 </source>
-        <translation>Fichier vide!
+        <translation>le fichier est vide !
 </translation>
     </message>
     <message>
@@ -3547,15 +3544,15 @@ Commandes disponibles :
     </message>
     <message>
         <source>Legacy Browser Integration</source>
-        <translation>Ancienne intégration au navigateur web</translation>
+        <translation>Ancienne intégration aux navigateurs</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation>Intégration Navigateur</translation>
+        <translation>Intégration aux navigateurs</translation>
     </message>
     <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
-        <translation>YubiKey[%1] Challenge-réponse - Slot %2 - %3</translation>
+        <translation>YubiKey[%1] question-réponse - Fente %2 - %3</translation>
     </message>
     <message>
         <source>Press</source>
@@ -3571,11 +3568,11 @@ Commandes disponibles :
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
-        <translation>Créé une nouvelle phrase secrète générée aléatoirement par Diceware</translation>
+        <translation>Créer une nouvelle phrase de passe générée au hasard par des dés.</translation>
     </message>
     <message>
         <source>Word count for the diceware passphrase.</source>
-        <translation>Nombre de mots de la phrase secrète générée par Diceware</translation>
+        <translation>Nombre de mots de la phrase de passe générée par des dés.</translation>
     </message>
     <message>
         <source>count</source>
@@ -3677,7 +3674,7 @@ Commandes disponibles :
     <name>Service</name>
     <message>
         <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC : nouvelle demande d’association</translation>
+        <translation>KeePassXC : Nouvelle demande d’association de touche</translation>
     </message>
     <message>
         <source>You have received an association request for the above key.
@@ -3689,43 +3686,43 @@ attribuez lui un nom unique pour l’identifier et acceptez-la.</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC : Écraser la clé existante ?</translation>
+        <translation>KeePassXC : Remplacer la clé existante ?</translation>
     </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 avec le nom « %1 » existe déjà.
-Voulez-vous l’écraser ?</translation>
+        <translation>Une clé de chiffrement partagée portant le nom « %1 » existe déjà.
+Voulez-vous la remplacer ?</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC : Mettre à jour l’entrée</translation>
+        <translation>KeePassXC : Mettre l’entrée à jour</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Voulez-vous mettre à jour l’information dans %1 - %2 ?</translation>
+        <translation>Voulez-vous mettre à jour l’information dans %1 - %2 ?</translation>
     </message>
     <message>
         <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC : Base de données verrouillée !</translation>
+        <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 actuelle est verrouillée !
-            Veuillez déverrouiller la base de données sélectionnée, ou choisir une base de données déverrouillée. </translation>
+        <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: Removed keys from database</source>
-        <translation>KeePassXC : Les clés ont été effacées de la base de données</translation>
+        <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é(s) de chiffrement ont été retirées des paramètres KeePassX/Http.</numerusform><numerusform>%n-clé(s) chiffrement ont été retirées des paramètres KeePassX/Http.</numerusform></translation>
+        <translation><numerusform>%n clé de chiffrement a été retirée avec succès des paramètres de KeePassXC/HTTP.</numerusform><numerusform>%n clés chiffrement ont été retirées avec succès des paramètres KeePassXC/HTTP.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC : Aucune clé trouvée</translation>
+        <translation>KeePassXC : Aucune clé n’a été trouvée</translation>
     </message>
     <message>
         <source>No shared encryption-keys found in KeePassHttp Settings.</source>
@@ -3733,15 +3730,15 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Paramètre indisponible !</translation>
+        <translation>KeePassXC : Les paramètres ne sont pas disponibles !</translation>
     </message>
     <message>
         <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de données actuelle ne contient pas d’entrée de paramètres KeePassHttp.</translation>
+        <translation>La base de données active ne contient pas d’entrée de paramètres KeePassHttp.</translation>
     </message>
     <message>
         <source>Removing stored permissions...</source>
-        <translation>Effacement des permissions enregistrées…</translation>
+        <translation>Retrait des autorisations enregistrées…</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -3749,7 +3746,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC : Permissions retirées</translation>
+        <translation>KeePassXC : Les autorisations ont été retirées</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entries.</source>
@@ -3757,11 +3754,11 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC : Aucune entrée avec permissions trouvée !</translation>
+        <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 actuelle ne contient pas d’entrée avec des permissions.</translation>
+        <translation>La base de données active ne contient pas d’entrée avec des autorisations.</translation>
     </message>
 </context>
 <context>
@@ -3799,7 +3796,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Remember last key files and security dongles</source>
-        <translation>Se souvenir des derniers fichiers clé et des dongles de sécurité</translation>
+        <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>
@@ -3807,11 +3804,11 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Automatically save on exit</source>
-        <translation>Sauvegarder automatiquement à la sortie</translation>
+        <translation>Enregistrer automatiquement à la sortie</translation>
     </message>
     <message>
         <source>Automatically save after every change</source>
-        <translation>Sauvegarder automatiquement après chaque modification</translation>
+        <translation>Enregistrer automatiquement après chaque changement</translation>
     </message>
     <message>
         <source>Automatically reload the database when modified externally</source>
@@ -3819,7 +3816,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Minimize when copying to clipboard</source>
-        <translation>Réduire lors de la copie dans le presse-papier</translation>
+        <translation>Minimiser après avoir copié dans le presse-papiers</translation>
     </message>
     <message>
         <source>Minimize window at application startup</source>
@@ -3843,7 +3840,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Hide window to system tray when minimized</source>
-        <translation>Réduire la fenêtre vers la zone de notification lors de sa réduction</translation>
+        <translation>Cacher la fenêtre dans la zone de notification une fois minimisée</translation>
     </message>
     <message>
         <source>Hide window to system tray instead of app exit</source>
@@ -3919,7 +3916,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Clear clipboard after</source>
-        <translation>Vider le presse-papier après</translation>
+        <translation>Vider le presse-papiers après</translation>
     </message>
     <message>
         <source> sec</source>
@@ -3964,7 +3961,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Use Google as fallback for downloading website icons</source>
-        <translation>Utilisez Google en secours pour télécharger des icônes de site web</translation>
+        <translation>Utiliser Google en second recours pour télécharger les icônes des sites Web</translation>
     </message>
     <message>
         <source>Re-lock previously locked database after performing Auto-Type</source>
@@ -4100,19 +4097,19 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>noms de fichiers des bases de données de mot de passe à ouvrir (*.kdbx)</translation>
+        <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>
+        <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>
+        <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>
+        <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>
diff --git a/share/translations/keepassx_lt.ts b/share/translations/keepassx_lt.ts
index 431c881f9c..03be1edb5b 100644
--- a/share/translations/keepassx_lt.ts
+++ b/share/translations/keepassx_lt.ts
@@ -445,7 +445,7 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
     </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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
@@ -461,7 +461,7 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -687,15 +687,15 @@ Please consider generating a new key file.</source>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n byte(s), </source>
-        <translation><numerusform>%n baitas, </numerusform><numerusform>%n baitai, </numerusform><numerusform>%n baitų, </numerusform></translation>
+        <translation><numerusform>%n baitas, </numerusform><numerusform>%n baitai, </numerusform><numerusform>%n baitų, </numerusform><numerusform>%n baitų, </numerusform></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></translation>
+        <translation><numerusform>%n eilutė, </numerusform><numerusform>%n eilutės, </numerusform><numerusform>%n eilučių, </numerusform><numerusform>%n eilučių, </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation><numerusform>%n stulpelis</numerusform><numerusform>%n stulpeliai</numerusform><numerusform>%n stulpelių</numerusform></translation>
+        <translation><numerusform>%n stulpelis</numerusform><numerusform>%n stulpeliai</numerusform><numerusform>%n stulpelių</numerusform><numerusform>%n stulpelių</numerusform></translation>
     </message>
 </context>
 <context>
@@ -848,12 +848,12 @@ If you keep this number, your database may be too easy to crack!</source>
     <message numerus="yes">
         <source> MiB</source>
         <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <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></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -1109,7 +1109,7 @@ Disable safe saves and try again?</source>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Ar tikrai norite perkelti %n įrašą į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašus į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašų į šiukšlinę?</numerusform></translation>
+        <translation><numerusform>Ar tikrai norite perkelti %n įrašą į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašus į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašų į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašų į šiukšlinę?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1357,11 +1357,11 @@ Ar norite sulieti savo pakeitimus?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n savaitė</numerusform><numerusform>%n savaitės</numerusform><numerusform>%n savaičių</numerusform></translation>
+        <translation><numerusform>%n savaitė</numerusform><numerusform>%n savaitės</numerusform><numerusform>%n savaičių</numerusform><numerusform>%n savaičių</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mėnesis</numerusform><numerusform>%n mėnesiai</numerusform><numerusform>%n mėnesių</numerusform></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>
@@ -1412,11 +1412,11 @@ Ar norite sulieti savo pakeitimus?</translation>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation type="unfinished"/>
+        <translation>Priekinio plano spalva:</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation type="unfinished"/>
+        <translation>Fono spalva:</translation>
     </message>
 </context>
 <context>
@@ -1750,11 +1750,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"/>
+        <translation>Raktas</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"/>
+        <translation>Reikšmė</translation>
     </message>
 </context>
 <context>
@@ -1804,7 +1804,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Confirm Remove</source>
@@ -1822,7 +1822,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
-        <translation type="unfinished"/>
+        <translation>Ar tikrai norite perrašyti failą &quot;%1&quot; priedu?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
@@ -1963,7 +1963,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <translation>Priedai (piktograma)</translation>
     </message>
 </context>
 <context>
@@ -2108,7 +2108,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>Neteisingas antraštės lauko ilgis</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
@@ -2132,7 +2132,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid inner header field length</source>
-        <translation type="unfinished"/>
+        <translation>Neteisingas vidinės antraštės lauko ilgis</translation>
     </message>
     <message>
         <source>Invalid inner header binary size</source>
@@ -2381,7 +2381,7 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
     </message>
     <message>
         <source>Invalid date time value</source>
-        <translation type="unfinished"/>
+        <translation>Neteisinga datos laiko reikšmė</translation>
     </message>
     <message>
         <source>Invalid color value</source>
@@ -2393,7 +2393,7 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
     </message>
     <message>
         <source>Invalid number value</source>
-        <translation type="unfinished"/>
+        <translation>Neteisinga skaitmeninė reikšmė</translation>
     </message>
     <message>
         <source>Invalid uuid value</source>
@@ -2437,7 +2437,7 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
     <message>
         <source>Unable to read encryption IV</source>
         <comment>IV = Initialization Vector for symmetric cipher</comment>
-        <translation type="unfinished"/>
+        <translation>Nepavyko perskaityti šifravimo IV</translation>
     </message>
     <message>
         <source>Invalid number of groups</source>
@@ -2565,7 +2565,7 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
     </message>
     <message>
         <source>Invalid entry field type</source>
-        <translation type="unfinished"/>
+        <translation>Neteisingas įrašo lauko tipas</translation>
     </message>
 </context>
 <context>
@@ -3702,7 +3702,7 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
     </message>
     <message numerus="yes">
         <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
-        <translation><numerusform>%n šifravimo raktas sėkmingai pašalintas iš KeePassX/Http nustatymų.</numerusform><numerusform>%n šifravimo raktai sėkmingai pašalinti iš KeePassX/Http nustatymų.</numerusform><numerusform>%n šifravimo raktų sėkmingai pašalinta iš KeePassX/Http nustatymų.</numerusform></translation>
+        <translation><numerusform>%n šifravimo raktas sėkmingai pašalintas iš KeePassX/Http nustatymų.</numerusform><numerusform>%n šifravimo raktai sėkmingai pašalinti iš KeePassX/Http nustatymų.</numerusform><numerusform>%n šifravimo raktų sėkmingai pašalinta iš KeePassX/Http nustatymų.</numerusform><numerusform>%n šifravimo raktų sėkmingai pašalinta iš KeePassX/Http nustatymų.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -3734,7 +3734,7 @@ Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Leidimai sėkmingai pašalinti iš %n įrašo.</numerusform><numerusform>Leidimai sėkmingai pašalinti iš %n įrašų.</numerusform><numerusform>Leidimai sėkmingai pašalinti iš %n įrašų.</numerusform></translation>
+        <translation><numerusform>Leidimai sėkmingai pašalinti iš %n įrašo.</numerusform><numerusform>Leidimai sėkmingai pašalinti iš %n įrašų.</numerusform><numerusform>Leidimai sėkmingai pašalinti iš %n įrašų.</numerusform><numerusform>Leidimai sėkmingai pašalinti iš %n įrašų.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
diff --git a/share/translations/keepassx_pl.ts b/share/translations/keepassx_pl.ts
index 1e9608734d..49a1e633b2 100644
--- a/share/translations/keepassx_pl.ts
+++ b/share/translations/keepassx_pl.ts
@@ -866,7 +866,7 @@ Jeśli zachowasz ten numer, twoja baza danych może być zbyt łatwa do złamani
     <message numerus="yes">
         <source> thread(s)</source>
         <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>
+        <translation><numerusform> wątek</numerusform><numerusform> wątki</numerusform><numerusform> wątków</numerusform><numerusform> wątków</numerusform></translation>
     </message>
 </context>
 <context>
diff --git a/share/translations/keepassx_sk.ts b/share/translations/keepassx_sk.ts
new file mode 100644
index 0000000000..0e73dd894a
--- /dev/null
+++ b/share/translations/keepassx_sk.ts
@@ -0,0 +1,4123 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>O KeepassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>O aplikácii</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>Chyby hláste na: &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 je distribuovaný za podmienok GNU General Public License (GPL) verzie 2 alebo (podľa Vášho výberu) verzie 3.</translation>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation>Prispievatelia</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;Viď prispievateľov na GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation>Ladiace informácie</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Do každého hlásenia chyby zahrňte nasledujúce informácie:</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <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>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>Distribúcia %1</translation>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation>Knižnice:</translation>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation>Operačný systém: %1
+Architektúra CPU: %2
+Jadro: %3 %4</translation>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation>Zapnuté rozšírenia:</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Správcovia projektu:</translation>
+    </message>
+    <message>
+        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
+        <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>
+    </message>
+</context>
+<context>
+    <name>AccessControlDialog</name>
+    <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Potvrdenie prístupu</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Zapamätať si túto voľbu</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Povoliť</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Zakázať</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>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Zapnúť Agenta SSH (vyžaduje reštart)</translation>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation>Nemožno nájsť žiadnu položku, ktorá zodpovedá názvu okna:</translation>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automatické vypĺňanie – KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>Syntax Vášho Automatického vypĺňania nie je správna!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Tento príkaz Automatického vypĺňania obsahuje príliš dlhú pauzu. Naozaj ho chcete vykonať?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Tento príkaz Automatického vypĺňania obsahuje príliš pomalé stlačenia kláves. Naozaj ho chcete vykonať?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Tento príkaz Automatického vypĺňania obsahuje argumenty, ktoré sú opakované príliš často. Naozaj ho chcete vykonať?</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Postupnosť</translation>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation>Predvolená postupnosť</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeMatchModel</name>
+    <message>
+        <source>Group</source>
+        <translation>Skupina</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Nadpis</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Používateľské meno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Postupnosť</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automatické vypĺňanie – KeePassXC</translation>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation>Vyberte položku na Automatické vypĺňanie:</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Prehliadač Potvrďte prístup</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Zapamätať si túto voľbu</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Povoliť</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Zakázať</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>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Toto je potrebné na prístup k vašim databázam cez KeePassXC-Prehliadač</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Zapnúť Integráciu KeepassXC v prehliadači</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Zapnúť integráciu v týchto prehliadačoch:</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>Zobraziť upozor&amp;nenie, keď sú požadované údaje</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://, ...) are returned.</source>
+        <translation>Vrátené budú len položky s rovnakou schémou (http://, https://, …).</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>Zhoda sché&amp;m URL (napr., https://…)</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 credentials</source>
+        <translation>V&amp;rátiť len údaje s najlepšou zhodou</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Zoradiť vyhovujúce údaje podľa &amp;názvu</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <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>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nikdy s&amp;a nepýtať pred prístupom k údajom</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nikdy sa nepýtať pred &amp;úpravou údajov</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 credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>&amp;Hľadať vyhovujúce údaje 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>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation>Pri štarte automaticky aktualizovať cestu spustiteľného súboru s KeePassXC alebo keepassxc-proxy na skripty posielania správ medzi prehliadačom a KeePassXC (native messaging).</translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation>Pri štarte automaticky aktualizovať súbory manifestu správ medzi prehliadačom a KeePassXC (native messaging)</translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Podporovať aplikáciu proxy medzi KeePassXC a rozšírením prehliadača.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>&amp;Použiť aplikáciu proxy medzi KeePassXC a rozšírením prehliadača.</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation>Použiť vlastné umiestnenie proxy, ak ste nainštalovali proxy manuálne.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Použiť &amp;vlastné umiestnenie proxy</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Prechádzať…</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>
+    </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>
+    <message>
+        <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>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nová požiadavka priradenia kľúča</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>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>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Uložiť a povoliť prístup</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Prepísať existujúci kľúč?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Zdiľaný šifrovací kľúč s menom „%1” už existuje.
+Chcete ho prepísať?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Upraviť položku</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <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>
+    </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>
+    </message>
+    <message>
+        <source>Empty password</source>
+        <translation>Prázdne heslo</translation>
+    </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>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>Zadané heslá s líšia.</translation>
+    </message>
+    <message>
+        <source>Failed to set %1 as the Key file:
+%2</source>
+        <translation>Zlyhalo nastavenie %1 ako súboru kľúča:
+%2</translation>
+    </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 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>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation>Voľby klonovania</translation>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Pripojiť do názvu „- Klon”</translation>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation>Nahradiť použ. meno a heslo odkazmi</translation>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation>Kopírovať históriu</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation>Importovať polia CSV</translation>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation>meno súboru</translation>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation>veľkosť, riadky, stĺpce</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Kódovanie</translation>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation>Kodek</translation>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation>Text je vymedzený pomocou </translation>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation>Polia sú oddelené pomocou</translation>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation>Komentáre začínajú znakom</translation>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation>Prvý záznam obsahuje názvy polí</translation>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation>Počet riadkov hlavičky na zahodenie</translation>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation>Považovať „\” za znak „escape”</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Ukážka</translation>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation>Rozloženie stĺpcov</translation>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <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>
+    <message>
+        <source>Original data: </source>
+        <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>
+    </message>
+    <message>
+        <source> more messages skipped]</source>
+        <translation>ďalšie správy preskočené]</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+</source>
+        <translation>Import CSV: zapisovač má chyby:
+</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWizard</name>
+    <message>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</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 bajtov</numerusform><numerusform>%n bajtov</numerusform></translation>
+    </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>
+    </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>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation>Zadajte hlavný kľúč</translation>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation>Súbor kľúča:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Prechádzať</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Obnoviť</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <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>
+    <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>Don&apos;t show this warning again</source>
+        <translation>Nezobrazovať znova toto upozornenie</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Súbory kľúčov</translation>
+    </message>
+    <message>
+        <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>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <source>Can&apos;t open key file</source>
+        <translation>Nemožno otvoriť súbor kľúča</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Nemožno otvoriť databázu.</translation>
+    </message>
+    <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Databáza úspešne otvorená. Nič netreba vykonať.</translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation>Úspešné</translation>
+    </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>
+    </message>
+    <message>
+        <source>Unable to repair the database.</source>
+        <translation>Nemožno opraviť databázu.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidget</name>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Šifrovanie</translation>
+    </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><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ákien</numerusform><numerusform>vlákien</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Šifrovací algoritmus:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 bitov (predvolené)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 bitov</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Funkcia odvodenia kľúča (KDF):</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Počet transformácií:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>1-sekundové oneskorenie testu výkonu</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Využitie pamäte:</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelizmus:</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Meta dáta databázy</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Meno databázy:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Popis databázy:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Predvolené použ. meno:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Nastavenia histórie</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Max. položiek histórie:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Max. veľkosť histórie:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Použiť kôš</translation>
+    </message>
+    <message>
+        <source>Additional Database Settings</source>
+        <translation>Dodatočné nastavenia databázy</translation>
+    </message>
+    <message>
+        <source>Enable &amp;compression (recommended)</source>
+        <translation>Zapnúť &amp;komprimáciu (odporúčané)</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Koreň</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>Databáza KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Otvoriť databázu</translation>
+    </message>
+    <message>
+        <source>File not found!</source>
+        <translation>Súbor nenájdený!</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Nemožno otvoriť databázu.</translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation>Súbor otvorený v režime len na čítanie.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Otvoriť súbor CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Súbor CSV</translation>
+    </message>
+    <message>
+        <source>All files (*)</source>
+        <translation>Všetky súbory (*)</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>Close?</source>
+        <translation>Zatvoriť?</translation>
+    </message>
+    <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>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation>Uložiť zmeny?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>„%1” bol zmenený.
+Uložiť zmeny?</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Zápis databázy zlyhal.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Heslá</translation>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>Uložiť databázu ako</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportovať databázu do súboru CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Zápis do súboru CSV zlyhal.</translation>
+    </message>
+    <message>
+        <source>New database</source>
+        <translation>Nová databáza</translation>
+    </message>
+    <message>
+        <source>locked</source>
+        <translation>zamknuté</translation>
+    </message>
+    <message>
+        <source>Lock database</source>
+        <translation>Zamknúť databázu</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>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>
+    </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>
+    </message>
+    <message>
+        <source>Disable safe saves?</source>
+        <translation>Vypnúť bezpečné ukladanie?</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 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>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <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>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation>Vykonať príkaz?</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>Naozaj chcete spustiť nasledujúci príkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <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>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation>Žiadna zdrojová databáza, niet čo robiť.</translation>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation>Výsledky hľadania (%1)</translation>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation>Žiadne výsledky</translation>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation>Súbor bol zmenený</translation>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>Súbor databázy bol zmenený. Chcete načítať zmeny?</translation>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation>Požiadavka zlúčenia</translation>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>Súbor databázy bol zmenený a Vy máte neuložené zmeny.
+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>
+    <message>
+        <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>
+    <message>
+        <source>Close</source>
+        <translation>Zatvoriť</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Platí do</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Používateľské meno</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Hľadanie</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>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Postupnosť</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>Disabled</source>
+        <translation>Vypnuté</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Zapnuté</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation>Položka</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>História</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>neznáme</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(šifrované)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Zvoľte súkromný kľúč</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Súbor je na súkromný kľúč príliš veľký</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Zlyhalo otvorenie súkromného kľúča</translation>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation>História položky</translation>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation>Pridať položku</translation>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation>Upraviť položku</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>Zadané heslá s líšia.</translation>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <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>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform><numerusform>%n týždňov</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation><numerusform>%n mesiac</numerusform><numerusform>%n mesiace</numerusform><numerusform>%n mesiacov</numerusform><numerusform>%n mesiacov</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>
+    <message>
+        <source>Do you want to apply the generated password to this entry?</source>
+        <translation>Chcete v tejto položke použiť generované heslo?</translation>
+    </message>
+    <message>
+        <source>Entry updated successfully.</source>
+        <translation>Položka úspešne zmenená.</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation>Ďalšie atribúty</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Pridať</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation>Upraviť názov</translation>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation>Chrániť</translation>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation>Odkryť</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Prílohy</translation>
+    </message>
+    <message>
+        <source>Foreground Color:</source>
+        <translation>Farba popredia:</translation>
+    </message>
+    <message>
+        <source>Background Color:</source>
+        <translation>Farba pozadia:</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation>Zapnúť Automatické vypĺňanie pre túto položku</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Zdediť predvolenú postupnosť Automatického &amp;vypĺňania zo skupiny</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Po&amp;užiť vlastnú postupnosť Automatického vypĺňania:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Priradenie okna</translation>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Názov okna:</translation>
+    </message>
+    <message>
+        <source>Use a specific sequence for this association:</source>
+        <translation>Pre toto priradenie použiť špecifickú postupnosť:</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation>Zobraziť</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>Vrátiť</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation>Odstrániť všetko</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Opakovať:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Názov:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation>Predvoľby</translation>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Prepnite zaškrtávacie pole na odkrytie sekcie poznámok.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Použ. meno:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Platí do</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulár</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Odstrániť kľúč z agenta po</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>sekundy</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Odtlačok</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Odstrániť kľúč z agenta po zatvorení/zamknutí databázy</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Verejný kľúč</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Pridať kľúč do agenta keď je databáza otvorená/odomknutá</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Komentár</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Dešifrovať</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>neznáme</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Kopírovať do schránky</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Súkromný kľúč</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Externý súbor</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Prechádzať…</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Príloha</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Pridať do agenta</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Odstrániť z agenta</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Vyžadovať potvrdenie používateľa, keď je tento kľúč použitý</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>Skupina</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Ikona</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Vlastnosti</translation>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation>Pridať skupinu</translation>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation>Upraviť skupinu</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Zapnúť</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Vypnúť</translation>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation>Zdediť z nadradenej skupiny (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation>Názov</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Platí do</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Hľadať</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vypĺňanie</translation>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation>Po&amp;užiť predvolenú postupnosť Automatického vypĺňania rodičovskej skupiny</translation>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation>Nastaviť predvolenú &amp;postupnosť Automatického vypĺňania</translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>Po&amp;užiť predvolenú ikonu</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Použiť &amp;vlastnú ikonu</translation>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation>Pridať vlastnú ikonu</translation>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation>Odstrániť vlastnú ikonu</translation>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation>Stiahnuť ikonu stránky</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <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>
+    <message>
+        <source>All files</source>
+        <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>
+    <message>
+        <source>Confirm Delete</source>
+        <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>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation>Vytvorené:</translation>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation>Zmenené:</translation>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation>Pristupované:</translation>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation>UUID:</translation>
+    </message>
+    <message>
+        <source>Plugin Data</source>
+        <translation>Dáta zásuvného modulu</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Delete plugin data?</source>
+        <translation>Odstrániť dáta zásuvného modulu?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the selected plugin data?
+This may cause the affected plugins to malfunction.</source>
+        <translation>Naozaj chcete odstrániť dáta zvoleného zásuvného modulu?
+Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation>
+    </message>
+    <message>
+        <source>Key</source>
+        <translation>Kľúč</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
+        <translation>– Klonovať</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Názov</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Veľkosť</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulár</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Pridať</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odstrániť</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Otvoriť</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Uložiť</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Zvoľte súbory</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <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>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Nemožno vytvoriť zložku:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Naozaj chcete prepísať existujúci súbor „%1” prílohou?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Potvrďte prepísanie</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Nemožno uložiť prílohy:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Nemožno otvoriť prílohu:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Nemožno otvoriť prílohy:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Nemožno otvoriť súbory:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Názov</translation>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation>Posledná úprava</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Nadpis</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Použ. meno:</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>Skupina</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Nadpis</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Použ. meno:</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Platí do</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Vytvorené</translation>
+    </message>
+    <message>
+        <source>Modified</source>
+        <translation>Upravené</translation>
+    </message>
+    <message>
+        <source>Accessed</source>
+        <translation>Pristupované</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Prílohy</translation>
+    </message>
+</context>
+<context>
+    <name>EntryView</name>
+    <message>
+        <source>Customize View</source>
+        <translation>Prispôsobiť zobrazenie</translation>
+    </message>
+    <message>
+        <source>Hide Usernames</source>
+        <translation>Skryť použ. mená</translation>
+    </message>
+    <message>
+        <source>Hide Passwords</source>
+        <translation>Skryť heslá</translation>
+    </message>
+    <message>
+        <source>Fit to window</source>
+        <translation>Prispôsobiť oknu</translation>
+    </message>
+    <message>
+        <source>Fit to contents</source>
+        <translation>Prispôsobiť obsahu</translation>
+    </message>
+    <message>
+        <source>Reset to defaults</source>
+        <translation>Obnoviť predvolené</translation>
+    </message>
+    <message>
+        <source>Attachments (icon)</source>
+        <translation>Prílohy (ikona)</translation>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation>Kôš</translation>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Súbor nemožno uložiť!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Nemožno uložiť súbor skriptu správ medzi prehliadačom a KeePassXC (native messaging).</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-Ž</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>Malé písmená</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-ž</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>
+        <translation>&amp;Zatvoriť</translation>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation>Zatvoriť správu</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nemožno vyvolať výzvu – odpoveď.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Zlý kľúč alebo je súbor databázy poškodený.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nemožno vyvolať výzvu – odpoveď.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>chýbajúce hlavičky databázy</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Neplatná veľkosť kontrolného súčtu hlavičky</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Nezhoda hlavičky SHA256</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Zlý kľúč alebo je súbor databázy poškodený (nezhoda HMAC).</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Neznáma šifra</translation>
+    </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>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>Zlyhalo otvorenie bufera parametrov KDF v hlavičke</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>Nepodporovaná funkcia odvodenia kľúča (KDF) alebo neplatné parametre</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>V súbore KDBX4 nájdené staré polia hlavičiek.</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Neplatná veľkosť ID vnútornej hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>Neplatná dĺžka poľa vnútornej hlavičky</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>Neplatná binárna veľkosť vnútornej hlavičky</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Nepodporovaná verzia meta-dát KeePass.</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka názvu položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatné dáta názvu položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka hodnoty položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatné dáta hodnoty položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka hodnoty logickej položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka 32 bitovej celočíselnej hodnoty položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka 32 bitovej kladnej celočíselné hodnoty meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka 64 bitovej celočíselnej hodnoty meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná dĺžka 64 bitovej kladnej celočíselné hodnoty meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatný typ položky meta-dát</translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Neplatná veľkosť typu poľa meta-dát</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>Neplatný algoritmus symetrickej šifry.</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Neplatná veľkosť IV symetrickej šifry.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</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>Zlyhala serializácia parametrov KDF meta-dát</translation>
+    </message>
+</context>
+<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>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Neplatná dĺžka príznakov komprimácie</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Nepodporovaný komprimačný algoritmus</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Neplatná veľkosť hlavnej náhodnosti (seed)</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Neplatná transformácia náhodnosti (seed)</translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation>Neplatná veľkosť transformačných prechodov</translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>Neplatná počiatočná veľkosť bajtov</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Neplatná veľkosť ID náhodného prúdu</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation>Neplatná vnútorná náhodnosť prúdovej šifry</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Nie je databáza 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>Zvolený súbor je stará databáza KeePass 1 (.kdb).
+
+Môžete ju importovať kliknutím na Databáza &gt; „Importovať databázu KeePass 1…”.
+Je to jednosmerná migrácia. Importovanú databázu už nebude možné otvoriť pomocou starej verzie KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Nepodporovaná verzia databázy KeePass 2.</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>Chyba spracovania XML: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>Žiadna koreňová skupina</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>Chýbajúce UUID ikony alebo dáta</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>Chýbajúci kľúč alebo hodnota vlastných dát</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>Viaceré položky skupiny</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>Žiadne UUID skupiny</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation>Neplatné číslo ikony skupiny</translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Neplatná hodnota EnableAutoType</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>Neplatná hodnota EnableSearching</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>Nenájdené UUID skupiny</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>Žiadne UUID DeleteObject</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation>Chýbajúci UUID alebo čas DeletedObject</translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>Žiadne UUID položky</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation>Neplatné číslo ikony položky</translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation>Prvok histórie v položke histórie</translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>Nenájdené UUID položky</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <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>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation>Chýba textový kľúč alebo hodnota položky</translation>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation>Nájdená duplicitná príloha</translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation>Chýba binárny kľúč alebo hodnota položky</translation>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation>Chýba priradenie okna alebo postupnosť Automatického vypĺňania</translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Neplatná logická hodnota</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Neplatná hodnota dátumu/času</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Neplatná hodnota farby</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>Neplatná časť RGB farby</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Neplatná číselná hodnota</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Neplatná hodnota UUID</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Nemožno dekomprimovať binárku</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation>Importovať databázu KeePass 1</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Nemožno otvoriť databázu.</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>Nemožno čítať súbor kľúča.</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Nie je databáza KeePass</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation>Nepodporovaný šifrovací algoritmus.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation>Nepodporovaná verzia databázy KeePass.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Nemožno čítať šifrovací IV</translation>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Neplatný počet skupín</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>Neplatný počet položiek</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation>Neplatná veľkosť odtlačku obsahu</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Neplatná transformácia hlavnej náhodnosti (seed)</translation>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation>Neplatný počet transformačných prechodov</translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation>Nemožno zostaviť strom skupiny</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation>Koreň</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nemožno vypočítať hlavný kľúč</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Zlý kľúč alebo je súbor databázy poškodený.</translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation>Transformácia kľúča zlyhala</translation>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation>Neplatné číslo typu poľa skupiny</translation>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation>Neplatná veľkosť poľa skupiny</translation>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation>Prečítané dáta poľa skupiny nezodpovedajú veľkosťou</translation>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation>Nesprávna veľkosť ID poľa skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation>Nesprávna veľkosť poľa času vytvorenia skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation>Nesprávna veľkosť poľa času úpravy skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation>Nesprávna veľkosť poľa času prístupu skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation>nesprávna veľkosť poľa vypršania platnosti skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation>Nesprávna veľkosť poľa ikony skupiny</translation>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation>Nesprávna veľkosť poľa úrovne skupiny</translation>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation>Neplatný typ poľa skupiny</translation>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation>Chýbajúce ID alebo úrovne skupiny</translation>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation>Chýbajúce číslo typu poľa položky</translation>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation>Neplatná veľkosť poľa položky</translation>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation>Prečítané dáta poľa položky majú neplatnú veľkosť</translation>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation>Neplatná veľkosť UUID poľa položky</translation>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation>Neplatná veľkosť ID poľa položky skupiny</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation>Neplatná veľkosť poľa ikony položky</translation>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation>Neplatná veľkosť poľa vytvorenia položky</translation>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation>Neplatná veľkosť poľa poslednej úpravy</translation>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation>Neplatná veľkosť poľa vypršania platnosti</translation>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation>Neplatný typ poľa položky</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass2</name>
+    <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>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>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – odporúčané)</translation>
+    </message>
+</context>
+<context>
+    <name>Main</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>
+    </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>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>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Databáza</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <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>
+    <message>
+        <source>E&amp;ntries</source>
+        <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>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>&amp;Nástroje</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Koniec</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;O programe</translation>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Otvoriť databázu…</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation>&amp;Uložiť databázu</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <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>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>O&amp;dstrániť skupinu</translation>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <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>
+    <message>
+        <source>&amp;Clone entry</source>
+        <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>
+    <message>
+        <source>Copy username to clipboard</source>
+        <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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>Na&amp;stavenia</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <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>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Názov</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation>Kopírovať názov do schránky</translation>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Kopírovať URL do schránky</translation>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>&amp;Poznámky</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation>Kopírovať poznámky do schránky</translation>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <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>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Kopírovať &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>V&amp;yprázdniť kôš</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Vymazať históriu</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>&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>
+    <message>
+        <source>Toggle window</source>
+        <translation>Prepnúť okno</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Skončiť KeePassXC</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>Databáza KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Všetky súbory</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Otvoriť databázu</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation>Uložiť opravenú databázu</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Zápis databázy zlyhal.</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Prosím, stlačte tlačidlo svojho 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>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>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Neplatný súbor kľúča, očakávaný je kľúč OpenSSH</translation>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation>Nezhoda ohraničenia PEM</translation>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation>Dekódovanie Base64 zlyhalo</translation>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation>Súbor kľúča je príliš krátky.</translation>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation>Neplatný ID magickej hlavičky súboru kľúča</translation>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation>Nenájdené žiadne kľúče</translation>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation>Zlyhalo čítanie verejného kľúča.</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Poškodený súbor kľúča, čítanie súkromného kľúč azlyhalo</translation>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation>Žiadny obsah súkromného kľúča na dešifrovanie</translation>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation>Pokúšate sa spustiť KDF bez šifry</translation>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Na dešifrovanie tohoto kľúča je potrebná tajná veta</translation>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Odvodenie kľúča zlyhalo, súbor kľúča je poškodený?</translation>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Dešifrovanie zlyhalo, zlá tajná veta?</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Neočakávaný koniec súboru pri čítaní verejného kľúča</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Neočakávaný koniec súboru pri čítaní súkromného kľúča</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Nemožno zapísať verejný kľúč, pretože je prázdny</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Neočakávaný koniec súboru pri zápise verejného kľúča</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Nemožno zapísať súkromný kľúč, pretože je prázdny</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Neočakávaný koniec súboru pri zápise súkromného kľúča</translation>
+    </message>
+    <message>
+        <source>Unsupported key type: %1</source>
+        <translation>Nepodporovaný typ kľúča: %1</translation>
+    </message>
+    <message>
+        <source>Unknown cipher: %1</source>
+        <translation>Neznáma šifra: %1</translation>
+    </message>
+    <message>
+        <source>Cipher IV is too short for MD5 kdf</source>
+        <translation>IV šifry je príliš krátky na MD5 KDF</translation>
+    </message>
+    <message>
+        <source>Unknown KDF: %1</source>
+        <translation>Neznáma KDF: %1</translation>
+    </message>
+    <message>
+        <source>Unknown key type: %1</source>
+        <translation>Neznámy typ kľúča: %1</translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <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 otvorený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>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Predvolený port: 19455</translation>
+    </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>
+    </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>
+    </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>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Nemožno použiť privilegované porty</translation>
+    </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>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Heslo:</translation>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>sila</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>náhodnosť</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</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>Lower Case Letters</source>
+        <translation>Malé písmená</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>Číslice</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>Špeciálne znaky</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>Rozšírené ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>Vynechať podobne vyzerajúce znaky</translation>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation>Zvoliť znak z každej skupiny</translation>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>&amp;Dĺžka:</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation>Tajná veta</translation>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <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>
+    <message>
+        <source>Accept</source>
+        <translation>Prijať</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <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>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation>Kvalita hesla: %1</translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation>Biedne</translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation>Slabé</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation>Dobré</translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation>Výbroné</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation>Databáza nie je otvorená</translation>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation>Odtlačok databázy nie je dostupný</translation>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation>Nebol prijatý verejný kľúč klienta</translation>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <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>
+    <message>
+        <source>Empty message received</source>
+        <translation>Prijatá prázdna správa</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>Nebolo poskytnuté URL</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Neboli nájdené prihlásenia</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Neznáma chyba</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Pridá do databázy novú položku</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Cesta k databáze.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Súbor kľúča databázy.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>cesta</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Použ. meno položky.</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>použmeno</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL položky.</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>Vyžiadať heslo položky.</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>Generovať heslo tejto položky.</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>Dĺžka generovaného hesla.</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>dĺžka</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Cesta pridávanej položky.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Skopíruje heslo položky do schránky.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Cesta položky na vystrihnutie.</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Časový limit pred vymazaním schránky.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Upraviť položku.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Názov položky.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>názov</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Cesta položky na úpravu.</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation>Očakávaná náhodnosť hesla.</translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation>Heslo, ktorému zistiť očakávanú náhodnosť.</translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation>Vykonať pokročilú analýzu hesla.</translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Vytiahnuť a vypísať obsah databázy.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Cesta databázy na vytiahnutie.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <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.
+
+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>
+
+Available commands:
+</source>
+        <translation>
+
+Dostupné príkazy:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Názov príkazu na spustenie.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Zoznam položiek databázy.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Cesta vypísanej skupiny. Predvolene /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Rýchlo nájdite položky.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Hľadaný výraz.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Zlúčiť dve databázy.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Cesta databázy, do ktorej zlúčiť.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Cesta k databáze, z ktorej zlúčiť.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Použiť rovnaké prihlásenie pre oba súbory databáz.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>Súbor kľúča databázy, z ktorej má byť zlúčené.</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Zobraziť informácie položky.</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>Názvy zobrazených atribútov. Táto voľba môže byť zadaná viac ako raz a každý atribút bude zobrazený jeden na riadok v zadanom poradí. Ak nie sú zadané žiadne atribúty, je použité zhrnutie predvolených atribútov.</translation>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>atribút</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Názov položky na zobrazenie.</translation>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation>Žiadne zariadenie</translation>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <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>
+    <message>
+        <source>missing closing quote</source>
+        <translation>chýbajúca koncová úvodzovka</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Skupina</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Nadpis</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Používateľské meno</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation>Posledná úprava</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <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>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation>YubiKey[%1] Výzva – odpoveď – slot %2 – %3</translation>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Stlačiť</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Pasívne</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
+    </message>
+    <message>
+        <source>Generate a new random diceware passphrase.</source>
+        <translation>Generovať novú náhodnú diceware tajnú vetu.</translation>
+    </message>
+    <message>
+        <source>Word count for the diceware passphrase.</source>
+        <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.
+[Predvolené: EFF angličtina]</translation>
+    </message>
+    <message>
+        <source>Generate a new random password.</source>
+        <translation>Generovať nové náhodné heslo.</translation>
+    </message>
+    <message>
+        <source>Length of the generated password.</source>
+        <translation>Dĺžka generovaného hesla.</translation>
+    </message>
+    <message>
+        <source>Use lowercase characters in the generated password.</source>
+        <translation>V generovanom hesle použiť malé písmená.</translation>
+    </message>
+    <message>
+        <source>Use uppercase characters in the generated password.</source>
+        <translation>V generovanom hesle použiť veľké písmená.</translation>
+    </message>
+    <message>
+        <source>Use numbers in the generated password.</source>
+        <translation>V generovanom hesle použiť číslice.</translation>
+    </message>
+    <message>
+        <source>Use special characters in the generated password.</source>
+        <translation>V generovanom hesle použiť špeciálne znaky.</translation>
+    </message>
+    <message>
+        <source>Use extended ASCII in the generated password.</source>
+        <translation>V generovanom hesle použiť rozšírené ASCII.</translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation>Pri komprimácii sa vyskytla interná chyba zlib:</translation>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation>Chyba zápisu na zariadenie:</translation>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation>Chyba otvorenia zariadenia:</translation>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation>Chyba čítania dát zo zariadenia:</translation>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation>Pri dekomprimácii sa vyskytla interná chyba zlib:</translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation>Formát gzip nie je touto verziou zlib podporovaný.</translation>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation>Interná chyba zlib:</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search...</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>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>
+</context>
+<context>
+    <name>Service</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nová požiadavka priradenia kľúča</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>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>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Prepísať existujúci kľúč?</translation>
+    </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>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Upraviť položku</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <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: 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/Http.</numerusform><numerusform>Úspešne odstránených %n šifrovacích kľúčov z nastavenia KeePassX/Http.</numerusform></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 KeePassHttp Settings.</source>
+        <translation>Nenájdené žiadne šifrovacie kľúče v nastavení KeePassHttp.</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 an entry of KeePassHttp Settings.</source>
+        <translation>Aktívna databáza neobsahuje položku nastavení KeePassHttp.</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 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>
+    <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>SettingsWidget</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>
+</context>
+<context>
+    <name>SettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Základné nastavenia</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>Automatically save on exit</source>
+        <translation>Automaticky uložiť pri ukončení</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automaticky uložiť po každej zmene</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>Minimize when copying to clipboard</source>
+        <translation>Minimalizovať pri skopírovaní do schránky</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalizovať okno pri spustení aplikácie</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>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>Hide the Details view</source>
+        <translation>Skryť zobrazenie podrobností</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Zobraziť ikonu v 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>Hide window to system tray instead of app exit</source>
+        <translation>Skryť okno do oznamovacej oblasti namiesto ukončenia</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Tmavá ikona oznamovacej oblasti</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 delay</source>
+        <translation>Oneskorenie Automatického vypĺňania</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <source>Startup</source>
+        <translation>Štart</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>Entry Management</source>
+        <translation>Správa položky</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetSecurity</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>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>Lock databases after minimizing the window</source>
+        <translation>Zamknúť databázu pri minimalizovaní okna</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>Show passwords in cleartext by default</source>
+        <translation>Predvolene zobraziť heslo prostým textom</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the preview panel</source>
+        <translation>Skryť heslá v paneli ukážky</translation>
+    </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 Google as fallback for downloading website icons</source>
+        <translation>Použiť Google ako poslednú záchranu pri sťahovaní ikon webovej stránky</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>
+</context>
+<context>
+    <name>SetupTotpDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation>Nastaviť TOTP</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Kľúč:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>Predvolené nastavenia tokenu RFC 6238</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Nastavenie Steam tokenu</translation>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <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>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation>Časový krok:</translation>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation>8 číslic</translation>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation>6 číslic</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Veľkosť kódu:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>s</translation>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>Časové heslo</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
+    </message>
+    <message>
+        <source>Expires in</source>
+        <translation>Vyprší za</translation>
+    </message>
+    <message>
+        <source>seconds</source>
+        <translation>s</translation>
+    </message>
+</context>
+<context>
+    <name>UnlockDatabaseWidget</name>
+    <message>
+        <source>Unlock database</source>
+        <translation>Odomknúť databázu</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation>Začnite ukladať svoje heslá bezpečne v databáze KeePassXC</translation>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation>Vytvoriť novú databázu</translation>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation>Otvoriť existujúcu databázu</translation>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation>Importovať z KeePass 1</translation>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation>Importované z CSV</translation>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation>Nedávne databázy</translation>
+    </message>
+    <message>
+        <source>Welcome to KeePassXC %1</source>
+        <translation>Vitajte v KeePassXC %1</translation>
+    </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>
+    <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>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_sv.ts b/share/translations/keepassx_sv.ts
index 79e4e10d07..f66e51d367 100644
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@@ -73,7 +73,7 @@ Kärna: %3 %4</translation>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation type="unfinished"/>
+        <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
@@ -280,20 +280,20 @@ Vill du tillåta det?</translation>
     <message>
         <source>Sort &amp;matching credentials by title</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Sortera &amp;matchande autentiseringsuppgifter per titel</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>Sortera matchande autentiseringsuppgifter per &amp;användarnamn</translation>
     </message>
     <message>
         <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Koppla från alla browsers</translation>
     </message>
     <message>
         <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
+        <translation>Glöm alla ihågkomna &amp;rättigheter</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -302,16 +302,16 @@ Vill du tillåta det?</translation>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>&amp;Fråga aldrig innan åtkomst till autentiseringsuppgifter</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>Fråga aldrig innan &amp;uppdatering av autetiseringsuppgifter</translation>
     </message>
     <message>
         <source>Only the selected database has to be connected with a client.</source>
-        <translation type="unfinished"/>
+        <translation>Endast den valda databasen måste vara ansluten med en klient.</translation>
     </message>
     <message>
         <source>Searc&amp;h in all opened databases for matching credentials</source>
@@ -362,7 +362,7 @@ Vill du tillåta det?</translation>
     </message>
     <message>
         <source>Executable Files (*.exe);;All Files (*.*)</source>
-        <translation type="unfinished"/>
+        <translation>Exekverbara filer (*.exe);;Alla filer (*.*)</translation>
     </message>
     <message>
         <source>Executable Files (*)</source>
@@ -446,7 +446,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Removing stored permissions…</source>
-        <translation type="unfinished"/>
+        <translation>Raderar sparade rättigheter...</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -462,7 +462,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Ingen post med behörigheter hittades!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with permissions.</source>
@@ -485,7 +485,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>&amp;Key file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Nyckel-fil</translation>
     </message>
     <message>
         <source>Browse</source>
@@ -683,15 +683,15 @@ Please consider generating a new key file.</source>
     <name>CsvParserModel</name>
     <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 rad(er),</numerusform><numerusform>%n rad(er),</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n kolumn(er)</numerusform><numerusform>%n kolumn(er)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -741,7 +741,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
-        <translation type="unfinished"/>
+        <translation>Visa inte denna varning igen</translation>
     </message>
     <message>
         <source>All files</source>
@@ -801,7 +801,7 @@ Du kan nu spara den.</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation type="unfinished"/>
+        <translation>Kryptering</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
@@ -835,7 +835,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>KDF unchanged</source>
-        <translation type="unfinished"/>
+        <translation>KDF oförändrad</translation>
     </message>
     <message>
         <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
@@ -844,19 +844,19 @@ If you keep this number, your database may be too easy to crack!</source>
     <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>tråd(ar)</numerusform><numerusform>tråd(ar)</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
     <message>
         <source>Encryption Algorithm:</source>
-        <translation type="unfinished"/>
+        <translation>Krypteringsalgoritm:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -864,7 +864,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
-        <translation type="unfinished"/>
+        <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
         <source>Key Derivation Function:</source>
@@ -880,7 +880,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Memory Usage:</source>
-        <translation type="unfinished"/>
+        <translation>Minnesanvändning:</translation>
     </message>
     <message>
         <source>Parallelism:</source>
@@ -891,7 +891,7 @@ If you keep this number, your database may be too easy to crack!</source>
     <name>DatabaseSettingsWidgetGeneral</name>
     <message>
         <source>Database Meta Data</source>
-        <translation type="unfinished"/>
+        <translation>Databas metadata</translation>
     </message>
     <message>
         <source>Database name:</source>
@@ -907,7 +907,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>Inställningar historik</translation>
     </message>
     <message>
         <source>Max. history items:</source>
@@ -927,7 +927,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ytterligare databasinställningar</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
@@ -1057,7 +1057,7 @@ I annat fall försvinner ändringarna.</translation>
     </message>
     <message>
         <source>Disable safe saves?</source>
-        <translation type="unfinished"/>
+        <translation>Inaktivera spara säkert?</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.
@@ -1149,7 +1149,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>File has changed</source>
-        <translation type="unfinished"/>
+        <translation>Filen har ändrats</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -1170,7 +1170,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Empty recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation>Töm papperskorgen?</translation>
     </message>
     <message>
         <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
@@ -1181,7 +1181,7 @@ Do you want to merge your changes?</source>
     <name>DetailsWidget</name>
     <message>
         <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+        <translation>Generera TOTP Token</translation>
     </message>
     <message>
         <source>Close</source>
@@ -1201,7 +1201,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Expiration</source>
-        <translation type="unfinished"/>
+        <translation>Utgår</translation>
     </message>
     <message>
         <source>Username</source>
@@ -1209,15 +1209,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Autotype</source>
-        <translation type="unfinished"/>
+        <translation>Autotyp</translation>
     </message>
     <message>
         <source>Searching</source>
-        <translation type="unfinished"/>
+        <translation>Söker</translation>
     </message>
     <message>
         <source>Attributes</source>
-        <translation type="unfinished"/>
+        <translation>Attribut</translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -1249,15 +1249,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
+        <translation>[SKYDDAD]</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"/>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"/>
+        <translation>Aktiverad</translation>
     </message>
 </context>
 <context>
@@ -1296,7 +1296,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>(encrypted)</source>
-        <translation type="unfinished"/>
+        <translation>(krypterad)</translation>
     </message>
     <message>
         <source>Select private key</source>
@@ -1336,11 +1336,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
-        <translation type="unfinished"/>
+        <translation>Är du säker på att du vill ta bort detta attribut?</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
+        <translation>[SKYDDAD]</translation>
     </message>
     <message>
         <source>Press reveal to view or edit</source>
@@ -1391,7 +1391,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Edit Name</source>
-        <translation type="unfinished"/>
+        <translation>Redigera namn</translation>
     </message>
     <message>
         <source>Protect</source>
@@ -1407,11 +1407,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation type="unfinished"/>
+        <translation>Förgrundsfärg:</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation type="unfinished"/>
+        <translation>Bakgrundsfärg:</translation>
     </message>
 </context>
 <context>
@@ -1523,7 +1523,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Fingerprint</source>
-        <translation type="unfinished"/>
+        <translation>Fingeravtryck</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
@@ -1539,11 +1539,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished"/>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <source>Decrypt</source>
-        <translation type="unfinished"/>
+        <translation>Dekryptera</translation>
     </message>
     <message>
         <source>n/a</source>
@@ -1559,7 +1559,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>External file</source>
-        <translation type="unfinished"/>
+        <translation>Extern fil</translation>
     </message>
     <message>
         <source>Browse...</source>
@@ -1568,7 +1568,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"/>
+        <translation>Bilaga</translation>
     </message>
     <message>
         <source>Add to agent</source>
@@ -1669,15 +1669,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Download favicon</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner favicon</translation>
     </message>
     <message>
         <source>Unable to fetch favicon.</source>
-        <translation type="unfinished"/>
+        <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 type="unfinished"/>
+        <translation>Tips: Du kan aktivera Google som reserv under Verktyg&gt;Inställningar&gt;Säkerhet</translation>
     </message>
     <message>
         <source>Images</source>
@@ -1693,7 +1693,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Can&apos;t read icon</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte läsa ikon</translation>
     </message>
     <message>
         <source>Custom icon already exists</source>
@@ -1701,7 +1701,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+        <translation>Bekräfta radering</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>
@@ -1728,7 +1728,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Plugin Data</source>
-        <translation type="unfinished"/>
+        <translation>Tilläggsdata</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -1736,7 +1736,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Delete plugin data?</source>
-        <translation type="unfinished"/>
+        <translation>Radera tilläggsdata?</translation>
     </message>
     <message>
         <source>Do you really want to delete the selected plugin data?
@@ -1745,11 +1745,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"/>
+        <translation>Nyckel</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"/>
+        <translation>Värde</translation>
     </message>
 </context>
 <context>
@@ -1757,7 +1757,7 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source> - Clone</source>
         <comment>Suffix added to cloned entries</comment>
-        <translation type="unfinished"/>
+        <translation>- Klon</translation>
     </message>
 </context>
 <context>
@@ -1768,7 +1768,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"/>
+        <translation>Storlek</translation>
     </message>
 </context>
 <context>
@@ -1795,7 +1795,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Select files</source>
-        <translation type="unfinished"/>
+        <translation>Välj filer</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
@@ -1807,7 +1807,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation type="unfinished"/>
+        <translation>Spara bilagor</translation>
     </message>
     <message>
         <source>Unable to create directory:
@@ -1840,7 +1840,8 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>Unable to open files:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Lyckas inte öppna filer:
+%1</translation>
     </message>
 </context>
 <context>
@@ -1933,27 +1934,27 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Hide Usernames</source>
-        <translation type="unfinished"/>
+        <translation>Dölj användarnamn</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Dölj lösenord</translation>
     </message>
     <message>
         <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <translation>Anpassa till fönster</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <translation>Anpassa för innehåll</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
-        <translation type="unfinished"/>
+        <translation>Återställ till standardvärden</translation>
     </message>
     <message>
         <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <translation>Bilagor (ikon)</translation>
     </message>
 </context>
 <context>
@@ -1967,7 +1968,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Kan inte spara fil!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
@@ -1990,7 +1991,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>A-Z</source>
-        <translation type="unfinished"/>
+        <translation>A-Z</translation>
     </message>
     <message>
         <source>Lower Case Letters</source>
@@ -1998,7 +1999,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>a-z</source>
-        <translation type="unfinished"/>
+        <translation>a-z</translation>
     </message>
     <message>
         <source>Numbers</source>
@@ -2006,7 +2007,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>0-9</source>
-        <translation type="unfinished"/>
+        <translation>0-9</translation>
     </message>
     <message>
         <source>Special Characters</source>
@@ -2014,7 +2015,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>/*_&amp; ...</source>
-        <translation type="unfinished"/>
+        <translation>/*_&amp; ...</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
@@ -2033,11 +2034,11 @@ This may cause the affected plugins to malfunction.</source>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Stäng</translation>
     </message>
     <message>
         <source>Close message</source>
-        <translation type="unfinished"/>
+        <translation>Stäng meddelande</translation>
     </message>
 </context>
 <context>
@@ -2090,7 +2091,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Unknown cipher</source>
-        <translation type="unfinished"/>
+        <translation>Okänt krypto</translation>
     </message>
     <message>
         <source>Invalid header id size</source>
@@ -2272,7 +2273,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     <name>KdbxXmlReader</name>
     <message>
         <source>XML parsing failure: %1</source>
-        <translation type="unfinished"/>
+        <translation>XML-tolkning misslyckades: %1</translation>
     </message>
     <message>
         <source>No root group</source>
@@ -2602,14 +2603,14 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>KeePassXC - Error</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC - Fel</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>&amp;Database</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Databas</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
@@ -2621,7 +2622,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hjälp</translation>
     </message>
     <message>
         <source>E&amp;ntries</source>
@@ -2629,43 +2630,43 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Copy att&amp;ribute to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera att&amp;ribut till urklipp</translation>
     </message>
     <message>
         <source>Time-based one-time password</source>
-        <translation type="unfinished"/>
+        <translation>Tidsbaserat engångslösenord</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Grupper</translation>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Verktyg</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Avsluta</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Om</translation>
     </message>
     <message>
         <source>&amp;Open database...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Öppna databas</translation>
     </message>
     <message>
         <source>&amp;Save database</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Spara databas</translation>
     </message>
     <message>
         <source>&amp;Close database</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Stäng databas</translation>
     </message>
     <message>
         <source>&amp;New database</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ny databas</translation>
     </message>
     <message>
         <source>Merge from KeePassX database</source>
@@ -2673,39 +2674,39 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Add new entry</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Lägg till ny post</translation>
     </message>
     <message>
         <source>&amp;View/Edit entry</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Visa/redigera post</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Radera post</translation>
     </message>
     <message>
         <source>&amp;Add new group</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Lägg till ny grupp</translation>
     </message>
     <message>
         <source>&amp;Edit group</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Redigera grupp</translation>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Radera grupp</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
-        <translation type="unfinished"/>
+        <translation>Sp&amp;ara databas som...</translation>
     </message>
     <message>
         <source>Change &amp;master key...</source>
-        <translation type="unfinished"/>
+        <translation>Ändra &amp;huvudlösenord</translation>
     </message>
     <message>
         <source>&amp;Database settings</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Databasinställningar</translation>
     </message>
     <message>
         <source>Database settings</source>
@@ -2713,15 +2714,15 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Clone entry</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Klona post</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hitta</translation>
     </message>
     <message>
         <source>Copy &amp;username</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera &amp;användarnamn</translation>
     </message>
     <message>
         <source>Copy username to clipboard</source>
@@ -2729,7 +2730,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Cop&amp;y password</source>
-        <translation type="unfinished"/>
+        <translation>Kop&amp;iera lösenord</translation>
     </message>
     <message>
         <source>Copy password to clipboard</source>
@@ -2737,7 +2738,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Inställningar</translation>
     </message>
     <message>
         <source>Password Generator</source>
@@ -2749,15 +2750,15 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Open URL</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Öppna URL</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Lås databas</translation>
     </message>
     <message>
         <source>&amp;Title</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Titel</translation>
     </message>
     <message>
         <source>Copy title to clipboard</source>
@@ -2765,7 +2766,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;URL</source>
-        <translation type="unfinished"/>
+        <translation>&amp;URL</translation>
     </message>
     <message>
         <source>Copy URL to clipboard</source>
@@ -2773,7 +2774,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Notes</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Noteringar</translation>
     </message>
     <message>
         <source>Copy notes to clipboard</source>
@@ -2781,11 +2782,11 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportera till CSV-fil...</translation>
     </message>
     <message>
         <source>Import KeePass 1 database...</source>
-        <translation type="unfinished"/>
+        <translation>Importera KeePass 1 databas...</translation>
     </message>
     <message>
         <source>Import CSV file...</source>
@@ -2793,7 +2794,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Re&amp;pair database...</source>
-        <translation type="unfinished"/>
+        <translation>Re&amp;parera databas...</translation>
     </message>
     <message>
         <source>Show TOTP</source>
@@ -2809,7 +2810,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>E&amp;mpty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation>T&amp;öm papperskorg</translation>
     </message>
     <message>
         <source>Clear history</source>
@@ -2962,11 +2963,11 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Unknown KDF: %1</source>
-        <translation type="unfinished"/>
+        <translation>Okänd KDF: %1</translation>
     </message>
     <message>
         <source>Unknown key type: %1</source>
-        <translation type="unfinished"/>
+        <translation>Okänd nyckeltyp: %1</translation>
     </message>
 </context>
 <context>
@@ -3046,7 +3047,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Only the selected database has to be connected with a client.</source>
-        <translation type="unfinished"/>
+        <translation>Endast den valda databasen måste vara ansluten med en klient.</translation>
     </message>
     <message>
         <source>Searc&amp;h in all opened databases for matching entries</source>
@@ -3070,7 +3071,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC kommer att lyssna på denna port på 127.0.0.1</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
@@ -3238,7 +3239,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Action cancelled or denied</source>
-        <translation type="unfinished"/>
+        <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>
@@ -3258,7 +3259,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>No saved databases found</source>
-        <translation type="unfinished"/>
+        <translation>Ingen sparad databas hittades</translation>
     </message>
     <message>
         <source>Incorrect action</source>
@@ -3334,7 +3335,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera en posts lösenord till urklipp.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -3555,11 +3556,11 @@ Tillgängliga kommandon:
     </message>
     <message>
         <source>Generate a new random password.</source>
-        <translation type="unfinished"/>
+        <translation>Generera ett nytt slumpmässigt lösenord.</translation>
     </message>
     <message>
         <source>Length of the generated password.</source>
-        <translation type="unfinished"/>
+        <translation>Längden av det genererade lösenordet.</translation>
     </message>
     <message>
         <source>Use lowercase characters in the generated password.</source>
@@ -3719,7 +3720,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Ingen post med behörigheter hittades!</translation>
     </message>
     <message>
         <source>The active database does not contain an entry with permissions.</source>
@@ -3866,7 +3867,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Entry Management</source>
-        <translation type="unfinished"/>
+        <translation>Posthantering</translation>
     </message>
     <message>
         <source>General</source>
@@ -3949,7 +3950,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Steam token settings</source>
-        <translation type="unfinished"/>
+        <translation>Steam token inställningar</translation>
     </message>
     <message>
         <source>Use custom settings</source>
diff --git a/share/translations/keepassx_tr.ts b/share/translations/keepassx_tr.ts
index e4fc45277f..b10711c9d4 100644
--- a/share/translations/keepassx_tr.ts
+++ b/share/translations/keepassx_tr.ts
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>Contributors</source>
-        <translation>Katkıcılar</translation>
+        <translation>Katkı Verenler</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>
@@ -69,16 +69,16 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Project Maintainers:</source>
-        <translation>Tasarı Bakımcıları:</translation>
+        <translation>Proje Sahipleri:</translation>
     </message>
     <message>
         <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
-        <translation type="unfinished"/>
+        <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>İnşa Türü: %1
+        <translation>Yapı Tarzı: %1
 </translation>
     </message>
 </context>
@@ -90,7 +90,7 @@ MİB mimarisi: %2
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation>Bu kararı anımsa</translation>
+        <translation>Bu kararı hatırla</translation>
     </message>
     <message>
         <source>Allow</source>
@@ -111,7 +111,7 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     <name>AgentSettingsWidget</name>
     <message>
         <source>Enable SSH Agent (requires restart)</source>
-        <translation type="unfinished"/>
+        <translation>SSH Aracısı&apos;nı etkinleştir (yeniden başlatma gerektirir)</translation>
     </message>
 </context>
 <context>
@@ -130,19 +130,19 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation type="unfinished"/>
+        <translation>Oto-Yazım ifadenizin sözdizimi yanlış!</translation>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Bu Oto-Yazım komutu çok uzun bir gecikme içeriyor. Gerçekten devam etmek istiyor musun?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Bu Oto-Yazım komutu çok yavaş tuşa basar. Gerçekten devam etmek istiyor musun?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Bu Oto-Yazım komutu çok sık tekrarlanan argümanlar içerir. Gerçekten devam etmek istiyor musun?</translation>
     </message>
 </context>
 <context>
@@ -164,7 +164,7 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     <name>AutoTypeMatchModel</name>
     <message>
         <source>Group</source>
-        <translation>Küme</translation>
+        <translation>Grup</translation>
     </message>
     <message>
         <source>Title</source>
@@ -187,18 +187,18 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Oto-Yazım için girdi seçiniz:</translation>
+        <translation>Oto-Yazım için girdi seçin:</translation>
     </message>
 </context>
 <context>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-Tarayıcı Erişim Onayı</translation>
     </message>
     <message>
         <source>Remember this decision</source>
-        <translation>Bu kararı anımsa</translation>
+        <translation>Bu kararı hatırla</translation>
     </message>
     <message>
         <source>Allow</source>
@@ -211,8 +211,8 @@ Lütfen erişime izin vermek istediklerinizi seçin.</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, şu öge(ler) için parolalara erişim izni istedi.
-Lütfen erişime izin vermek istediklerinizi seçin.</translation>
+        <translation>%1, şu öge(ler) için şifrelere erişim izni istedi.
+Lütfen erişime izin vermek isteyip istemediğinizi belirtin.</translation>
     </message>
 </context>
 <context>
@@ -223,11 +223,11 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>This is required for accessing your databases with KeePassXC-Browser</source>
-        <translation type="unfinished"/>
+        <translation>Bu KeePassXC-Tarayıcı ile veritabanlarınıza erişmek için gereklidir.</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC tarayıcı entegrasyonunu etkinleştir</translation>
     </message>
     <message>
         <source>General</source>
@@ -235,66 +235,66 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>Enable integration for these browsers:</source>
-        <translation type="unfinished"/>
+        <translation>Bu tarayıcılar için entegrasyonu etkinleştir:</translation>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Google Chrome</translation>
     </message>
     <message>
         <source>&amp;Firefox</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Firefox</translation>
     </message>
     <message>
         <source>&amp;Chromium</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Chromium</translation>
     </message>
     <message>
         <source>&amp;Vivaldi</source>
-        <translation type="unfinished"/>
+        <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>Kimlik bilgileri istendiğinde bir &amp;bildirim göster</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>
+        <translation>Eğer kilitliyse veritabanını açmayı is&amp;te</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
-        <translation type="unfinished"/>
+        <translation>Sadece aynı şemaya sahip girişler (http://, https://, ...) döndürülür.</translation>
     </message>
     <message>
         <source>&amp;Match URL scheme (e.g., https://...)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Eşleşme URL şeması (ör., https://...)</translation>
     </message>
     <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>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>
+        <translation>Yalnızca tüm alan adı için tüm girdiler yerine belirli bir URL için en iyi eşleşenleri döndürür.</translation>
     </message>
     <message>
         <source>&amp;Return only best-matching credentials</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Yalnızca en iyi eşleşen kimlik bilgilerini döndür</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>Eşleşen kimlik bilgilerini başlığa göre &amp;sırala</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>Eşleşen kimlik bilgilerini &amp;kullanıcı adına göre sırala</translation>
     </message>
     <message>
         <source>&amp;Disconnect all browsers</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tüm tarayıcıları kapatın</translation>
     </message>
     <message>
         <source>Forget all remembered &amp;permissions</source>
-        <translation type="unfinished"/>
+        <translation>Tüm hatırlanan izinleri &amp;unut</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -303,79 +303,79 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     <message>
         <source>Never &amp;ask before accessing credentials</source>
         <extracomment>Credentials mean login data requested via browser extension</extracomment>
-        <translation type="unfinished"/>
+        <translation>Kimlik bilgilerine erişmeden önce &amp;asla sorma</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>Kimlik bilgilerini &amp;güncellemeden önce asla sorma</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>
+        <translation>Sadece seçilen veritabanının bir istemci ile bağlı olması gerekir.</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>Kimlik bilgilerini eşleştirmek için tüm açılan &amp;veritabanlarında ara</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>
+        <translation>Dizi alanlarını otomatik oluşturma veya 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>
+        <translation>&quot;KPH: &quot; ile başlayan gelişmiş dizi alanları &amp;döndür</translation>
     </message>
     <message>
         <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation type="unfinished"/>
+        <translation>Başlangıçta yerel mesajlaşma komut dosyalarına otomatik olarak KeePassXC veya keepassxc-proxy ikili yolu güncellenir.</translation>
     </message>
     <message>
         <source>Update &amp;native messaging manifest files at startup</source>
-        <translation type="unfinished"/>
+        <translation>Başlangıçta yerel mesajlaşma &amp;manifesto dosyalarını güncelle</translation>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC ve tarayıcı uzantısı arasında bir proxy uygulamasını desteklesin.</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC ve tarayıcı uzantısı arasında bir &amp;amp;proxy uygulaması kullan</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
-        <translation type="unfinished"/>
+        <translation>Eğer el ile bir proxy yüklediyseniz, özel bir proxy konumu kullanın.</translation>
     </message>
     <message>
         <source>Use a &amp;custom proxy location</source>
         <comment>Meant is the proxy for KeePassXC-Browser</comment>
-        <translation type="unfinished"/>
+        <translation>Ö&amp;zel bir proxy konumu kullan</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation type="unfinished"/>
+        <translation>Gözat...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation type="unfinished"/>
+        <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 type="unfinished"/>
+        <translation>Yürütülebilir Dosyalar (*.exe);;Bütün Dosyalar (*.*)</translation>
     </message>
     <message>
         <source>Executable Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Yürütülebilir Dosyalar (*)</translation>
     </message>
     <message>
         <source>Select custom proxy location</source>
-        <translation type="unfinished"/>
+        <translation>Özel proxy konumunu seçin</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>Üzgünüz, ancak şu anda Snap yayınları için KeePassXC-Tarayıcı desteklenmiyor.</translation>
     </message>
 </context>
 <context>
@@ -389,46 +389,50 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
 
 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>Yukarıdaki anahtar için bir ilişkilendirme isteği aldınız.
+
+Eğer KeePassXC veritabanınıza erişim izni vermek isterseniz, 
+onu tanımlamak için benzersiz bir isim ver ve kabul et.</translation>
     </message>
     <message>
         <source>Save and allow access</source>
-        <translation type="unfinished"/>
+        <translation>Kaydet ve erişime izin ver</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Var olan anahtarın üstüne yaz?</translation>
+        <translation>KeePassXC: Mevcut anahtarın üzerine yazılsın mı?</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>&quot;%1&quot; adıyla paylaşılan bir şifreleme anahtarı zaten var. 
+Üzerine yazmak istiyor musun?</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Girdi Güncelle</translation>
+        <translation>KeePassXC: Giriş Güncelleme</translation>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"/>
+        <translation>%1 -%2 bilgilerini güncellemek istiyor musun?</translation>
     </message>
     <message>
         <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Veri tabanı kilitli!</translation>
+        <translation>KeePassXC: Veritabanı 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>
+        <translation>Etkin veritabanı kilitli!
+Lütfen seçili veritabanının kilidini açın veya kilidi açılan başka bir tane seçin.</translation>
     </message>
     <message>
         <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
+        <translation>KeePassXC: Ayarlar mevcut değil!</translation>
     </message>
     <message>
         <source>The active database does not contain a settings entry.</source>
-        <translation type="unfinished"/>
+        <translation>Aktif veritabanı bir ayar girişi içermiyor.</translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -436,19 +440,19 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>No shared encryption keys found in KeePassXC Settings.</source>
-        <translation type="unfinished"/>
+        <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>
+        <translation>KeePassXC: Anahtarlar veritabanından kaldırıldı</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>Başarıyla %n şifreleme anahtarları KeePassXC ayarlarından kaldırıldı.</numerusform><numerusform>%n şifreleme anahtarı(lar), KeePassXC ayarlarından başarıyla kaldırıldı.</numerusform></translation>
     </message>
     <message>
         <source>Removing stored permissions…</source>
-        <translation type="unfinished"/>
+        <translation>Depolanmış izinler kaldırılıyor…</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -456,11 +460,11 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC: Silinen yetkiler</translation>
+        <translation>KeePassXC: Kaldırılan izinler</translation>
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Başarıyla izinleri %n entry(s) kaldırıldı.</numerusform><numerusform>%n giriş(ler)den izinler başarıyla kaldırıldı.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -468,22 +472,22 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </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>
+        <translation>Etkin veritabanı izinli bir giriş içermiyor.</translation>
     </message>
 </context>
 <context>
     <name>ChangeMasterKeyWidget</name>
     <message>
         <source>Password</source>
-        <translation>Parola</translation>
+        <translation>Şifre</translation>
     </message>
     <message>
         <source>Enter password:</source>
-        <translation>Parolayı gir:</translation>
+        <translation>Şifre gir:</translation>
     </message>
     <message>
         <source>Repeat password:</source>
-        <translation>Parolayı yinele:</translation>
+        <translation>Şifreyi yinele:</translation>
     </message>
     <message>
         <source>&amp;Key file</source>
@@ -499,7 +503,7 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>Cha&amp;llenge Response</source>
-        <translation type="unfinished"/>
+        <translation>Karşılaştırma &amp;Yanıtı</translation>
     </message>
     <message>
         <source>Refresh</source>
@@ -511,7 +515,7 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <translation>Bütün dosyalar</translation>
     </message>
     <message>
         <source>Create Key File...</source>
@@ -531,32 +535,35 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>Do you really want to use an empty string as password?</source>
-        <translation>Boş bir dizgeyi parola olarak kullanmak istediğinize emin misiniz?</translation>
+        <translation>Boş bir dizeyi gerçekten şifre olarak kullanmak ister misiniz?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Farklı parolalar sağlandı.</translation>
+        <translation>Farklı şifreler sağlandı.</translation>
     </message>
     <message>
         <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>%1, Anahtar dosyası olarak belirlenemedi:
+        <translation>%1 anahtar dosyası olarak ayarlanamadı:
 %2</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"/>
+        <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 consider generating a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>İleride desteklenmeyebilecek eski bir anahtar 
+dosya biçimi kullanıyorsunuz. 
+
+Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </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>
+        <translation>Ana anahtar değiştirme başarısız: YubiKey eklenmedi.</translation>
     </message>
 </context>
 <context>
@@ -571,7 +578,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Replace username and password with references</source>
-        <translation type="unfinished"/>
+        <translation>Kullanıcı adı ve şifreyi referanslarla değiştir</translation>
     </message>
     <message>
         <source>Copy history</source>
@@ -602,11 +609,11 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Text is qualified by</source>
-        <translation>Şu tarafından metin yetkilendirildi</translation>
+        <translation>tarafından metin yetkili</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
-        <translation>Şu tarafından alanlar bölümlendi</translation>
+        <translation>tarafından alanlar ayrıldı</translation>
     </message>
     <message>
         <source>Comments start with</source>
@@ -614,11 +621,11 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>First record has field names</source>
-        <translation>İlk kayıt alan adlarını içerir</translation>
+        <translation>İlk kaydın alan adlarını var</translation>
     </message>
     <message>
         <source>Number of headers line to discard</source>
-        <translation>Vazgeçilecek başlık satırı adedi</translation>
+        <translation>Vazgeçilecek başlık satırı sayısı</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
@@ -626,15 +633,15 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Preview</source>
-        <translation>Ön izle</translation>
+        <translation>Ön izleme</translation>
     </message>
     <message>
         <source>Column layout</source>
-        <translation>Kolon dizimi</translation>
+        <translation>Sütun düzeni</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation>CSV içerisinde mevcut değil</translation>
+        <translation>CSV dosyasında mevcut değil</translation>
     </message>
     <message>
         <source>Empty fieldname </source>
@@ -642,7 +649,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>column </source>
-        <translation>kolon</translation>
+        <translation>sütun</translation>
     </message>
     <message>
         <source>Imported from CSV file</source>
@@ -650,15 +657,15 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Original data: </source>
-        <translation>Özgün veri:</translation>
+        <translation>Orijinal veri:</translation>
     </message>
     <message>
         <source>Error(s) detected in CSV file !</source>
-        <translation>CSV dosyasında hata(lar) saptandı !</translation>
+        <translation>CSV dosyasında hata(lar) tespit edildi !</translation>
     </message>
     <message>
         <source> more messages skipped]</source>
-        <translation type="unfinished"/>
+        <translation> daha fazla ileti atlandı]</translation>
     </message>
     <message>
         <source>Error</source>
@@ -667,7 +674,7 @@ Please consider generating a new key file.</source>
     <message>
         <source>CSV import: writer has errors:
 </source>
-        <translation>CSV içe aktarma: yazıcıda hatalar:
+        <translation>CSV içe aktarma: yazarda hatalar var:
 </translation>
     </message>
 </context>
@@ -686,22 +693,22 @@ Please consider generating a new key file.</source>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n byte(s), </source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n bayt, </numerusform><numerusform>%n bayt(lar), </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s), </source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n satır, </numerusform><numerusform>%n satır(lar), </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n column(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n sütun</numerusform><numerusform>%n sütun(lar)</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
-        <translation>Ana anahtar gir</translation>
+        <translation>Ana anahtarı gir</translation>
     </message>
     <message>
         <source>Key File:</source>
@@ -709,7 +716,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Parola:</translation>
+        <translation>Şifre:</translation>
     </message>
     <message>
         <source>Browse</source>
@@ -721,34 +728,37 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Challenge Response:</source>
-        <translation type="unfinished"/>
+        <translation>Karşılaştırma Yanıtı:</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <translation>Veritabanı açılamıyor.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Anahtar dosya açılamıyor</translation>
+        <translation>Anahtar dosyası açılamıyor</translation>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"/>
+        <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 consider generating a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>İleride desteklenmeyebilecek eski bir anahtar 
+dosya biçimi kullanıyorsunuz. 
+
+Lütfen yeni bir anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
-        <translation type="unfinished"/>
+        <translation>Bu uyarıyı bir daha gösterme</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <translation>Bütün dosyalar</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -763,7 +773,7 @@ Please consider generating a new key file.</source>
     <name>DatabaseRepairWidget</name>
     <message>
         <source>Repair database</source>
-        <translation>Veri tabanını onar</translation>
+        <translation>Veritabanını onar</translation>
     </message>
     <message>
         <source>Error</source>
@@ -771,15 +781,15 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Anahtar dosya açılamıyor</translation>
+        <translation>Anahtar dosyası açılamıyor</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <translation>Veritabanı açılamıyor.</translation>
     </message>
     <message>
         <source>Database opened fine. Nothing to do.</source>
-        <translation>Veri tabanı açıldı. Yapılacak bir şey yok.</translation>
+        <translation>Veritabanı iyi açıldı. Yapılacak bir şey yok.</translation>
     </message>
     <message>
         <source>Success</source>
@@ -788,12 +798,12 @@ Please consider generating a new key file.</source>
     <message>
         <source>The database has been successfully repaired
 You can now save it.</source>
-        <translation>Veri tabanı başarıyla onarıldı
+        <translation>Veritabanı başarıyla onarıldı
 Artık kaydedebilirsiniz.</translation>
     </message>
     <message>
         <source>Unable to repair the database.</source>
-        <translation>Veri tabanı onarılamıyor.</translation>
+        <translation>Veritabanı onarılamıyor.</translation>
     </message>
 </context>
 <context>
@@ -804,66 +814,70 @@ Artık kaydedebilirsiniz.</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation type="unfinished"/>
+        <translation>Şifreleme</translation>
     </message>
     <message>
         <source>Number of rounds too high</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"/>
+        <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 type="unfinished"/>
+        <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 type="unfinished"/>
+        <translation>Anladım, sayı kalsın</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>İptal</translation>
     </message>
     <message>
         <source>Number of rounds too low</source>
         <comment>Key transformation rounds</comment>
-        <translation type="unfinished"/>
+        <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 type="unfinished"/>
+        <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 type="unfinished"/>
+        <translation>KDF değişmedi</translation>
     </message>
     <message>
         <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
-        <translation type="unfinished"/>
+        <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 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> iş parçacıği</numerusform><numerusform> iş parçacık(ları)</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetEncryption</name>
     <message>
         <source>Encryption Algorithm:</source>
-        <translation type="unfinished"/>
+        <translation>Şifreleme Algoritması:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
-        <translation>AES:  256 Bit   (öntanımlı)</translation>
+        <translation>AES: 256 Bit (varsayılan)</translation>
     </message>
     <message>
         <source>Twofish:  256 Bit</source>
@@ -871,15 +885,15 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar Türetme Fonksiyonu:</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
-        <translation type="unfinished"/>
+        <translation>Dönüşüm turları:</translation>
     </message>
     <message>
         <source>Benchmark 1-second delay</source>
-        <translation type="unfinished"/>
+        <translation>Karşılaştırma 1-saniyelik gecikme</translation>
     </message>
     <message>
         <source>Memory Usage:</source>
@@ -887,26 +901,26 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Parallelism:</source>
-        <translation type="unfinished"/>
+        <translation>Paralellik:</translation>
     </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetGeneral</name>
     <message>
         <source>Database Meta Data</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı Meta Verileri</translation>
     </message>
     <message>
         <source>Database name:</source>
-        <translation>Veri tabanı adı:</translation>
+        <translation>Veritabanı adı:</translation>
     </message>
     <message>
         <source>Database description:</source>
-        <translation>Veri tabanı ayrıntısı:</translation>
+        <translation>Veritabanı açıklaması:</translation>
     </message>
     <message>
         <source>Default username:</source>
-        <translation>Öntanımlı kullanıcı adı:</translation>
+        <translation>Varsayılan kullanıcı adı:</translation>
     </message>
     <message>
         <source>History Settings</source>
@@ -930,11 +944,11 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ek Veritabanı Ayarları</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sıkıştırmayı etkinleştir (önerilir)</translation>
     </message>
 </context>
 <context>
@@ -946,15 +960,15 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Veri Tabanı</translation>
+        <translation>KeePass 2 Veritabanı</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <translation>Bütün dosyalar</translation>
     </message>
     <message>
         <source>Open database</source>
-        <translation>Veri tabanı aç</translation>
+        <translation>Veritabanını aç</translation>
     </message>
     <message>
         <source>File not found!</source>
@@ -962,11 +976,11 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <translation>Veritabanı açılamıyor.</translation>
     </message>
     <message>
         <source>File opened in read only mode.</source>
-        <translation>Dosya salt okunur kipte açıldı.</translation>
+        <translation>Dosya salt okunur modda açıldı.</translation>
     </message>
     <message>
         <source>Open CSV file</source>
@@ -978,19 +992,19 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>All files (*)</source>
-        <translation>Tüm dosyalar (*)</translation>
+        <translation>Bütün dosyalar (*)</translation>
     </message>
     <message>
         <source>Merge database</source>
-        <translation>Veri tabanı birleştir</translation>
+        <translation>Veritabanını birleştir</translation>
     </message>
     <message>
         <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı aç</translation>
+        <translation>KeePass 1 veritabanı aç</translation>
     </message>
     <message>
         <source>KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı</translation>
+        <translation>KeePass 1 veritabanı</translation>
     </message>
     <message>
         <source>Close?</source>
@@ -999,8 +1013,8 @@ If you keep this number, your database may be too easy to crack!</source>
     <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>
+        <translation>&quot;%1&quot; düzenleme modunda.
+Değişikliklerden vazgeçip yine de kapatılsın mı?</translation>
     </message>
     <message>
         <source>Save changes?</source>
@@ -1010,23 +1024,23 @@ Değişikliklerden vazgeç ve her durumda kapat?</translation>
         <source>&quot;%1&quot; was modified.
 Save changes?</source>
         <translation>&quot;%1&quot; değiştirildi.
-Değişiklikleri kaydet?</translation>
+Değişiklikler kaydedilsin mi?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Veri tabanına yazma başarısız.</translation>
+        <translation>Veritabanına yazma başarısız.</translation>
     </message>
     <message>
         <source>Passwords</source>
-        <translation>Parolalar</translation>
+        <translation>Şifreler</translation>
     </message>
     <message>
         <source>Save database as</source>
-        <translation>Veri tabanını farklı kaydet</translation>
+        <translation>Veritabanını farklı kaydet</translation>
     </message>
     <message>
         <source>Export database to CSV file</source>
-        <translation>Veri tabanını CSV dosyasına dışa aktar</translation>
+        <translation>Veritabanını CSV dosyasına dışa aktar</translation>
     </message>
     <message>
         <source>Writing the CSV file failed.</source>
@@ -1034,7 +1048,7 @@ Değişiklikleri kaydet?</translation>
     </message>
     <message>
         <source>New database</source>
-        <translation>Yeni veri tabanı</translation>
+        <translation>Yeni veritabanı</translation>
     </message>
     <message>
         <source>locked</source>
@@ -1042,30 +1056,31 @@ Değişiklikleri kaydet?</translation>
     </message>
     <message>
         <source>Lock database</source>
-        <translation>Veri tabanını kilitle</translation>
+        <translation>Veritabanını kilitle</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>Ş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>
+        <translation>Şu anda düzenlemekte olduğunuz veritabanı kilitlenemiyor.
+Lütfen değişikliklerinizi sonlandırmak veya vazgeçmek için iptal tuşuna basın.</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>Veri tabanı değiştirildi.
-Kilitlemeden önce veri tabanını kaydetmek ister misiniz?
+        <translation>Bu veritabanı değiştirildi.
+Veritabanını kilitlemeden önce kaydetmek ister misiniz?
 Aksi halde değişiklikleriniz kaybolacak.</translation>
     </message>
     <message>
         <source>Disable safe saves?</source>
-        <translation type="unfinished"/>
+        <translation>Güvenli kaydetme devre dışı?</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>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>
 </context>
 <context>
@@ -1084,7 +1099,7 @@ Disable safe saves and try again?</source>
     </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>
+        <translation>&quot;%1&quot; girdisini gerçekten tamamen silmek istiyor musunuz?</translation>
     </message>
     <message>
         <source>Delete entries?</source>
@@ -1120,15 +1135,15 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>Remember my choice</source>
-        <translation>Seçimimi anımsa</translation>
+        <translation>Seçimimi hatırla</translation>
     </message>
     <message>
         <source>Delete group?</source>
-        <translation>Kümeyi sil?</translation>
+        <translation>Grubu 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>
+        <translation>&quot;%1&quot; grubunu gerçekten tamamen silmek istiyor musunuz?</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
@@ -1136,11 +1151,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>No current database.</source>
-        <translation>Geçerli veri tabanı yok.</translation>
+        <translation>Geçerli veritabanı yok.</translation>
     </message>
     <message>
         <source>No source database, nothing to do.</source>
-        <translation>Kaynak veri tabanı yok, yapılacak bir şey yok.</translation>
+        <translation>Kaynak veritabanı yok, yapılacak bir şey yok.</translation>
     </message>
     <message>
         <source>Search Results (%1)</source>
@@ -1152,11 +1167,11 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>File has changed</source>
-        <translation type="unfinished"/>
+        <translation>Dosya değişti</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Veri tabanı dosyası değiştirildi. Değişiklikleri yüklemek ister misiniz?</translation>
+        <translation>Veritabanı dosyası değiştirildi. Değişiklikleri yüklemek ister misiniz?</translation>
     </message>
     <message>
         <source>Merge Request</source>
@@ -1165,11 +1180,12 @@ Disable safe saves and try again?</source>
     <message>
         <source>The database file has changed and you have unsaved changes.
 Do you want to merge your changes?</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı dosyası değişti ve kaydedilmemiş değişiklikleriniz var.
+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>
+        <translation>Bu veritabanını otomatik olarak yeniden yüklemeye çalışırken yeni veritabanı dosyası açılamadı.</translation>
     </message>
     <message>
         <source>Empty recycle bin?</source>
@@ -1184,7 +1200,7 @@ Do you want to merge your changes?</source>
     <name>DetailsWidget</name>
     <message>
         <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+        <translation>TOTP Jetonu Oluştur</translation>
     </message>
     <message>
         <source>Close</source>
@@ -1196,7 +1212,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Password</source>
-        <translation>Parola</translation>
+        <translation>Şifre</translation>
     </message>
     <message>
         <source>URL</source>
@@ -1204,7 +1220,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Expiration</source>
-        <translation type="unfinished"/>
+        <translation>Geçerlilik</translation>
     </message>
     <message>
         <source>Username</source>
@@ -1212,11 +1228,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Autotype</source>
-        <translation type="unfinished"/>
+        <translation>Oto-yazım</translation>
     </message>
     <message>
         <source>Searching</source>
-        <translation type="unfinished"/>
+        <translation>Aranıyor</translation>
     </message>
     <message>
         <source>Attributes</source>
@@ -1224,7 +1240,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Ekler</translation>
+        <translation>Dosya ekleri</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1256,18 +1272,18 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"/>
+        <translation>Devre dışı</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"/>
+        <translation>Etkin</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
-        <translation>Girdi</translation>
+        <translation>Giriş</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -1291,7 +1307,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>SSH Agent</source>
-        <translation type="unfinished"/>
+        <translation>SSH Ajanı</translation>
     </message>
     <message>
         <source>n/a</source>
@@ -1303,31 +1319,31 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Select private key</source>
-        <translation type="unfinished"/>
+        <translation>Özel anahtar seç</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation type="unfinished"/>
+        <translation>Dosya bir özel anahtar olmak için çok büyük</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
-        <translation type="unfinished"/>
+        <translation>Özel anahtarı açma başarısız</translation>
     </message>
     <message>
         <source>Entry history</source>
-        <translation>Girdi geçmişi</translation>
+        <translation>Giriş geçmişi</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation>Girdi ekle</translation>
+        <translation>Giriş ekle</translation>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Girdiyi düzenle</translation>
+        <translation>Girişi düzenle</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Farklı parolalar sağlandı.</translation>
+        <translation>Farklı şifreler sağlandı.</translation>
     </message>
     <message>
         <source>New attribute</source>
@@ -1339,7 +1355,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Are you sure you want to remove this attribute?</source>
-        <translation>Bu özniteliği silmek istediğinizden emin misiniz?</translation>
+        <translation>Bu özniteliği kaldırmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
@@ -1347,7 +1363,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Press reveal to view or edit</source>
-        <translation type="unfinished"/>
+        <translation>Görüntüleme veya düzenlemeyi belirlemek için basın</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -1367,15 +1383,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Apply generated password?</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturulan şifreyi uygula?</translation>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturulan şifreyi bu girişe uygulamak istiyor musunuz?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
-        <translation type="unfinished"/>
+        <translation>Giriş başarıyla güncellendi.</translation>
     </message>
 </context>
 <context>
@@ -1406,30 +1422,30 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Attachments</source>
-        <translation>Ekler</translation>
+        <translation>Dosya ekleri</translation>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation type="unfinished"/>
+        <translation>Ön Plan Rengi:</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation type="unfinished"/>
+        <translation>Arka Plan Rengi:</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Bu girdi için Oto-Yazımı etkinleştir</translation>
+        <translation>Bu giriş için Oto-Yazımı etkinleştir</translation>
     </message>
     <message>
         <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Öntanımlı Oto-Yazım dizilişini &amp;kümeden devral</translation>
+        <translation>&amp;Gruptan varsayılan Oto-Yazım sırasını devral</translation>
     </message>
     <message>
         <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Özel Oto-Yazım dizilişi k&amp;ullan:</translation>
+        <translation>Özel Oto-Yazım sırası k&amp;ullan:</translation>
     </message>
     <message>
         <source>Window Associations</source>
@@ -1449,7 +1465,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Use a specific sequence for this association:</source>
-        <translation type="unfinished"/>
+        <translation>Bu ilişki için belirli bir sıra kullan:</translation>
     </message>
 </context>
 <context>
@@ -1479,7 +1495,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Parola:</translation>
+        <translation>Şifre:</translation>
     </message>
     <message>
         <source>Repeat:</source>
@@ -1499,7 +1515,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Toggle the checkbox to reveal the notes section.</source>
-        <translation type="unfinished"/>
+        <translation>Notlar bölümünü göstermek için onay kutusunu değiştirin.</translation>
     </message>
     <message>
         <source>Username:</source>
@@ -1507,46 +1523,46 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Biter</translation>
+        <translation>Geçersiz</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetSSHAgent</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Form</translation>
     </message>
     <message>
         <source>Remove key from agent after</source>
-        <translation type="unfinished"/>
+        <translation>Sonra ajandan anahtarı kaldır</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"/>
+        <translation>saniye</translation>
     </message>
     <message>
         <source>Fingerprint</source>
-        <translation type="unfinished"/>
+        <translation>Parmak izi</translation>
     </message>
     <message>
         <source>Remove key from agent when database is closed/locked</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı kapalı/kilitliyken ajandan anahtarı kaldır</translation>
     </message>
     <message>
         <source>Public key</source>
-        <translation type="unfinished"/>
+        <translation>Açık anahtar</translation>
     </message>
     <message>
         <source>Add key to agent when database is opened/unlocked</source>
-        <translation type="unfinished"/>
+        <translation>Veritabanı kapalı/kilitliyken ajana anahtar ekle</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished"/>
+        <translation>Yorum</translation>
     </message>
     <message>
         <source>Decrypt</source>
-        <translation type="unfinished"/>
+        <translation>Şifresiz</translation>
     </message>
     <message>
         <source>n/a</source>
@@ -1558,39 +1574,39 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>Özel anahtar</translation>
     </message>
     <message>
         <source>External file</source>
-        <translation type="unfinished"/>
+        <translation>Harici dosya</translation>
     </message>
     <message>
         <source>Browse...</source>
         <extracomment>Button for opening file dialog</extracomment>
-        <translation type="unfinished"/>
+        <translation>Gözat...</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"/>
+        <translation>Dosya eki</translation>
     </message>
     <message>
         <source>Add to agent</source>
-        <translation type="unfinished"/>
+        <translation>Ajana ekle</translation>
     </message>
     <message>
         <source>Remove from agent</source>
-        <translation type="unfinished"/>
+        <translation>Ajandan kaldır</translation>
     </message>
     <message>
         <source>Require user confirmation when this key is used</source>
-        <translation type="unfinished"/>
+        <translation>Bu tuş kullanıldığında kullanıcı onayı gerekir</translation>
     </message>
 </context>
 <context>
     <name>EditGroupWidget</name>
     <message>
         <source>Group</source>
-        <translation>Küme</translation>
+        <translation>Grup</translation>
     </message>
     <message>
         <source>Icon</source>
@@ -1602,30 +1618,30 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Add group</source>
-        <translation>Küme ekle</translation>
+        <translation>Grup ekle</translation>
     </message>
     <message>
         <source>Edit group</source>
-        <translation>Kümeyi düzenle</translation>
+        <translation>Grubu düzenle</translation>
     </message>
     <message>
         <source>Enable</source>
-        <translation>Etkinleştir</translation>
+        <translation>Etkin</translation>
     </message>
     <message>
         <source>Disable</source>
-        <translation>Devre dışı bırak</translation>
+        <translation>Devre dışı</translation>
     </message>
     <message>
         <source>Inherit from parent group (%1)</source>
-        <translation>Üst kümeden devral (%1)</translation>
+        <translation>Ana gruptan devral (%1)</translation>
     </message>
 </context>
 <context>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
-        <translation>Ad</translation>
+        <translation>Adı</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1633,7 +1649,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Biter</translation>
+        <translation>Geçersiz</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1645,22 +1661,22 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation>Üst kümenin öntanımlı Oto-Yazım dizilişini k&amp;ullan</translation>
+        <translation>Ana grubun varsayılan Oto-Yazım sırasını kullan</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation>Öntanımlı Oto-Yazım &amp;dizilişi belirle</translation>
+        <translation>Varsayılan Oto-Yazım &amp;sırasını ayarla</translation>
     </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
     <message>
         <source>&amp;Use default icon</source>
-        <translation>&amp;Öntanımlı simge kullan</translation>
+        <translation>&amp;Varsayılan simge kullan</translation>
     </message>
     <message>
         <source>Use custo&amp;m icon</source>
-        <translation>Öze&amp;l simge kullan</translation>
+        <translation>Özel si&amp;mge kullan</translation>
     </message>
     <message>
         <source>Add custom icon</source>
@@ -1680,7 +1696,7 @@ Do you want to merge your changes?</source>
     </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>
+        <translation>İpucu: Google’ı Araçlar&gt;Ayarlar&gt;Güvenlik altından geri almak gibi etkinleştirebilirsiniz</translation>
     </message>
     <message>
         <source>Images</source>
@@ -1688,7 +1704,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <translation>Bütün dosyalar</translation>
     </message>
     <message>
         <source>Select Image</source>
@@ -1708,7 +1724,7 @@ Do you want to merge your changes?</source>
     </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>
+        <translation>Bu simge %1 girişi tarafından kullanılıyor ve varsayılan simge tarafından değiştirilecek. Silmek istediğinize emin misiniz?</translation>
     </message>
 </context>
 <context>
@@ -1748,11 +1764,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Key</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"/>
+        <translation>Değer</translation>
     </message>
 </context>
 <context>
@@ -1771,14 +1787,14 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"/>
+        <translation>Boyut</translation>
     </message>
 </context>
 <context>
     <name>EntryAttachmentsWidget</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Form</translation>
     </message>
     <message>
         <source>Add</source>
@@ -1798,7 +1814,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Select files</source>
-        <translation type="unfinished"/>
+        <translation>Dosya seç</translation>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
@@ -1810,40 +1826,45 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Save attachments</source>
-        <translation type="unfinished"/>
+        <translation>Ekleri kaydet</translation>
     </message>
     <message>
         <source>Unable to create directory:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Dizin oluşturulamadı:
+%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>Eki, var olan &quot;%1&quot; dosyasının üstüne yazmak istediğinize emin misiniz?</translation>
     </message>
     <message>
         <source>Confirm overwrite</source>
-        <translation type="unfinished"/>
+        <translation>Üzerine yazımı onayla</translation>
     </message>
     <message>
         <source>Unable to save attachments:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Ekler kaydedilemiyor:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachment:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Ek açılamıyor:
+%1</translation>
     </message>
     <message>
         <source>Unable to open attachments:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Ekler açılamıyor:
+%1</translation>
     </message>
     <message>
         <source>Unable to open files:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Dosyalar açılamıyor:
+%1</translation>
     </message>
 </context>
 <context>
@@ -1913,15 +1934,15 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturuldu</translation>
     </message>
     <message>
         <source>Modified</source>
-        <translation type="unfinished"/>
+        <translation>Düzenlendi</translation>
     </message>
     <message>
         <source>Accessed</source>
-        <translation type="unfinished"/>
+        <translation>Erişildi</translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -1932,31 +1953,31 @@ This may cause the affected plugins to malfunction.</source>
     <name>EntryView</name>
     <message>
         <source>Customize View</source>
-        <translation type="unfinished"/>
+        <translation>Görünümü Özelleştir</translation>
     </message>
     <message>
         <source>Hide Usernames</source>
-        <translation type="unfinished"/>
+        <translation>Kullanıcı Adlarını Gizle</translation>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Parolaları Gizle</translation>
     </message>
     <message>
         <source>Fit to window</source>
-        <translation type="unfinished"/>
+        <translation>Pencereye sığdır</translation>
     </message>
     <message>
         <source>Fit to contents</source>
-        <translation type="unfinished"/>
+        <translation>İçeriklere sığdır</translation>
     </message>
     <message>
         <source>Reset to defaults</source>
-        <translation type="unfinished"/>
+        <translation>Öntanımlılara sıfırla</translation>
     </message>
     <message>
         <source>Attachments (icon)</source>
-        <translation type="unfinished"/>
+        <translation>Ekler (simge)</translation>
     </message>
 </context>
 <context>
@@ -1970,11 +1991,11 @@ This may cause the affected plugins to malfunction.</source>
     <name>HostInstaller</name>
     <message>
         <source>KeePassXC: Cannot save file!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Dosya kaydedilemiyor!</translation>
     </message>
     <message>
         <source>Cannot save the native messaging script file.</source>
-        <translation type="unfinished"/>
+        <translation>Yerel mesajlaşma betik dosyası kaydedilemiyor.</translation>
     </message>
 </context>
 <context>
@@ -2073,7 +2094,7 @@ This may cause the affected plugins to malfunction.</source>
     <name>Kdbx4Reader</name>
     <message>
         <source>missing database headers</source>
-        <translation type="unfinished"/>
+        <translation>eksik veri tabanı başlıkları</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
@@ -2081,15 +2102,15 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid header checksum size</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz başlık dosya özeti boyutu</translation>
     </message>
     <message>
         <source>Header SHA256 mismatch</source>
-        <translation type="unfinished"/>
+        <translation>Başlık SHA256 verisi uyuşmuyor</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
-        <translation type="unfinished"/>
+        <translation>Yanlış anahtar veya veri tabanı dosyası bozuk. (HMAC uyuşmuyor)</translation>
     </message>
     <message>
         <source>Unknown cipher</source>
@@ -2097,39 +2118,39 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid header id size</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz başlık kimliği boyutu</translation>
     </message>
     <message>
         <source>Invalid header field length</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz başlık alanı genişliği</translation>
     </message>
     <message>
         <source>Invalid header data length</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz başlık veri genişliği</translation>
     </message>
     <message>
         <source>Failed to open buffer for KDF parameters in header</source>
-        <translation type="unfinished"/>
+        <translation>Başlıktaki KDF parametreleri için tampon açılamıyor</translation>
     </message>
     <message>
         <source>Unsupported key derivation function (KDF) or invalid parameters</source>
-        <translation type="unfinished"/>
+        <translation>Desteklenmeyen Anahtar Türetme İşlevi (KDF) veya geçersiz parametreler</translation>
     </message>
     <message>
         <source>Legacy header fields found in KDBX4 file.</source>
-        <translation type="unfinished"/>
+        <translation>KDBX4 dosyasında eski başlık alanları bulundu.</translation>
     </message>
     <message>
         <source>Invalid inner header id size</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz iç başlık kimlik boyutu</translation>
     </message>
     <message>
         <source>Invalid inner header field length</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz iç başlık alann genişliği</translation>
     </message>
     <message>
         <source>Invalid inner header binary size</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz iç başlık ikili boyutu</translation>
     </message>
     <message>
         <source>Unsupported KeePass variant map version.</source>
@@ -2225,11 +2246,11 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Invalid compression flags length</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz sıkıştırma bayrakları genişliği</translation>
     </message>
     <message>
         <source>Unsupported compression algorithm</source>
-        <translation type="unfinished"/>
+        <translation>Desteklenmeyen sıkıştırma algoritması</translation>
     </message>
     <message>
         <source>Invalid master seed size</source>
@@ -2271,26 +2292,26 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>Unsupported KeePass 2 database version.</source>
-        <translation type="unfinished"/>
+        <translation>Desteklenmeyen KeePass 2 veri tabanı sürümü.</translation>
     </message>
 </context>
 <context>
     <name>KdbxXmlReader</name>
     <message>
         <source>XML parsing failure: %1</source>
-        <translation type="unfinished"/>
+        <translation>XML ayrıştırma başarısız: %1</translation>
     </message>
     <message>
         <source>No root group</source>
-        <translation type="unfinished"/>
+        <translation>Kök küme yok</translation>
     </message>
     <message>
         <source>Missing icon uuid or data</source>
-        <translation type="unfinished"/>
+        <translation>Simge uuid&apos;si veya verisi eksik</translation>
     </message>
     <message>
         <source>Missing custom data key or value</source>
-        <translation type="unfinished"/>
+        <translation>Özel veri anahtarı veya değeri eksik</translation>
     </message>
     <message>
         <source>Multiple group elements</source>
@@ -2767,7 +2788,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>Copy title to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Başlığı panoya kopyala</translation>
     </message>
     <message>
         <source>&amp;URL</source>
@@ -2775,7 +2796,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>Copy URL to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>URL&apos;yi panoya kopyala</translation>
     </message>
     <message>
         <source>&amp;Notes</source>
@@ -2783,7 +2804,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>Copy notes to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Notları panoya kopyala</translation>
     </message>
     <message>
         <source>&amp;Export to CSV file...</source>
@@ -2815,7 +2836,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>E&amp;mpty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation>Geri dönüşüm kutusunu b&amp;oşalt</translation>
     </message>
     <message>
         <source>Clear history</source>
@@ -2827,7 +2848,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </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"/>
+        <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 ileride 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>
@@ -2839,7 +2860,7 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>Toggle window</source>
-        <translation type="unfinished"/>
+        <translation>Pencereyi aç/kapa</translation>
     </message>
     <message>
         <source>Quit KeePassXC</source>
@@ -2873,14 +2894,16 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <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>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>
 </context>
 <context>
     <name>OpenSSHKey</name>
     <message>
         <source>Invalid key file, expecting an OpenSSH key</source>
-        <translation type="unfinished"/>
+        <translation>Geçersiz anahtar dosyası, OpenSSH anahtarı bekleniyor</translation>
     </message>
     <message>
         <source>PEM boundary mismatch</source>
@@ -2888,11 +2911,11 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Base64 decoding failed</source>
-        <translation type="unfinished"/>
+        <translation>Base64 çözme başarısız</translation>
     </message>
     <message>
         <source>Key file way too small.</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar dosyası çok küçük.</translation>
     </message>
     <message>
         <source>Key file magic header id invalid</source>
@@ -2900,15 +2923,15 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Found zero keys</source>
-        <translation type="unfinished"/>
+        <translation>Sıfır anahtar bulundu</translation>
     </message>
     <message>
         <source>Failed to read public key.</source>
-        <translation type="unfinished"/>
+        <translation>Genel anahtar okunamadı.</translation>
     </message>
     <message>
         <source>Corrupted key file, reading private key failed</source>
-        <translation type="unfinished"/>
+        <translation>Bozuk anahtar dosyası, özel anahtar okuma başarısız</translation>
     </message>
     <message>
         <source>No private key payload to decrypt</source>
@@ -2956,7 +2979,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Unsupported key type: %1</source>
-        <translation type="unfinished"/>
+        <translation>Desteklenmeyen anahtar türü: %1</translation>
     </message>
     <message>
         <source>Unknown cipher: %1</source>
@@ -2972,7 +2995,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Unknown key type: %1</source>
-        <translation type="unfinished"/>
+        <translation>Bilinmeyen anahtar türü: %1</translation>
     </message>
 </context>
 <context>
@@ -3080,11 +3103,11 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Uyarı:&lt;/b&gt; Aşağıdaki seçenekler tehlikeli olabilir!</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 type="unfinished"/>
+        <translation>&lt;p&gt;KeePassHTTP terk edilmiştir ve ileride 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>
     </message>
     <message>
         <source>Cannot bind to privileged ports</source>
@@ -3114,7 +3137,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>entropy</source>
-        <translation type="unfinished"/>
+        <translation>entropi</translation>
     </message>
     <message>
         <source>Password</source>
@@ -3225,7 +3248,7 @@ Using default port 19455.</source>
     <name>QObject</name>
     <message>
         <source>Database not opened</source>
-        <translation type="unfinished"/>
+        <translation>Veri tabanı açılmadı</translation>
     </message>
     <message>
         <source>Database hash not available</source>
@@ -3233,63 +3256,63 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Client public key not received</source>
-        <translation type="unfinished"/>
+        <translation>İstemci genel anahtarı alınmadı</translation>
     </message>
     <message>
         <source>Cannot decrypt message</source>
-        <translation type="unfinished"/>
+        <translation>İletinin şifresi çözülemedi</translation>
     </message>
     <message>
         <source>Timeout or cannot connect to KeePassXC</source>
-        <translation type="unfinished"/>
+        <translation>Zaman aşımı veya KeePassXC&apos;ye bağlanılamadı</translation>
     </message>
     <message>
         <source>Action cancelled or denied</source>
-        <translation type="unfinished"/>
+        <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 type="unfinished"/>
+        <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 type="unfinished"/>
+        <translation>KeePassXC ilişkilendirmesi başarısız, yeniden dene</translation>
     </message>
     <message>
         <source>Key change was not successful</source>
-        <translation type="unfinished"/>
+        <translation>Anahtar değişimi başarılı değil</translation>
     </message>
     <message>
         <source>Encryption key is not recognized</source>
-        <translation type="unfinished"/>
+        <translation>Şifreleme anahtarı tanınmadı</translation>
     </message>
     <message>
         <source>No saved databases found</source>
-        <translation type="unfinished"/>
+        <translation>Kaydedilmiş veri tabanı bulunamadı</translation>
     </message>
     <message>
         <source>Incorrect action</source>
-        <translation type="unfinished"/>
+        <translation>Doğru olmayan eylem</translation>
     </message>
     <message>
         <source>Empty message received</source>
-        <translation type="unfinished"/>
+        <translation>Boş ileti alındı</translation>
     </message>
     <message>
         <source>No URL provided</source>
-        <translation type="unfinished"/>
+        <translation>URL sağlanmadı</translation>
     </message>
     <message>
         <source>No logins found</source>
-        <translation type="unfinished"/>
+        <translation>Giriş bulunamadı</translation>
     </message>
     <message>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>Bilinmeyen hata</translation>
     </message>
     <message>
         <source>Add a new entry to a database.</source>
-        <translation type="unfinished"/>
+        <translation>Veri tabanına yeni girdi ekle.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
@@ -3297,23 +3320,23 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Key file of the database.</source>
-        <translation type="unfinished"/>
+        <translation>Veri tabanının anahtar dosyası.</translation>
     </message>
     <message>
         <source>path</source>
-        <translation type="unfinished"/>
+        <translation>yol</translation>
     </message>
     <message>
         <source>Username for the entry.</source>
-        <translation type="unfinished"/>
+        <translation>Girdi için kullanıcı adı.</translation>
     </message>
     <message>
         <source>username</source>
-        <translation type="unfinished"/>
+        <translation>kullanıcı adı</translation>
     </message>
     <message>
         <source>URL for the entry.</source>
-        <translation type="unfinished"/>
+        <translation>Girdi için URL.</translation>
     </message>
     <message>
         <source>URL</source>
@@ -3325,23 +3348,23 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Generate a password for the entry.</source>
-        <translation type="unfinished"/>
+        <translation>Girdi için parola oluştur.</translation>
     </message>
     <message>
         <source>Length for the generated password.</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturulan parola için uzunluk.</translation>
     </message>
     <message>
         <source>length</source>
-        <translation type="unfinished"/>
+        <translation>uzunluk</translation>
     </message>
     <message>
         <source>Path of the entry to add.</source>
-        <translation type="unfinished"/>
+        <translation>Eklenecek girdinin yolu.</translation>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Girdinin parolasını panoya kopyala.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -3350,35 +3373,35 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Timeout in seconds before clearing the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Pano temizlenmeden önce geçecek saniye.</translation>
     </message>
     <message>
         <source>Edit an entry.</source>
-        <translation type="unfinished"/>
+        <translation>Girdi düzenle.</translation>
     </message>
     <message>
         <source>Title for the entry.</source>
-        <translation type="unfinished"/>
+        <translation>Girdi için başlık.</translation>
     </message>
     <message>
         <source>title</source>
-        <translation type="unfinished"/>
+        <translation>başlık</translation>
     </message>
     <message>
         <source>Path of the entry to edit.</source>
-        <translation type="unfinished"/>
+        <translation>Düzenlenecek girdinin yolu.</translation>
     </message>
     <message>
         <source>Estimate the entropy of a password.</source>
-        <translation type="unfinished"/>
+        <translation>Parolanın entropisini ölç</translation>
     </message>
     <message>
         <source>Password for which to estimate the entropy.</source>
-        <translation type="unfinished"/>
+        <translation>Entropisi ölçülecek parola.</translation>
     </message>
     <message>
         <source>Perform advanced analysis on the password.</source>
-        <translation type="unfinished"/>
+        <translation>Parola üzerinde gelişmiş inceleme gerçekleştir.</translation>
     </message>
     <message>
         <source>Extract and print the content of a database.</source>
@@ -3390,25 +3413,31 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Insert password to unlock %1: </source>
-        <translation type="unfinished"/>
+        <translation>%1 kilidini kaldırmak için parola yerleştir: </translation>
     </message>
     <message>
         <source>Failed to load key file %1 : %2</source>
-        <translation type="unfinished"/>
+        <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.
 
 Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>UYARI: Gelecekte desteklenmeyebilecek eski anahtar dosyası
+biçimini kullanıyorsunuz.
+
+Lütfen yeni anahtar dosyası oluşturmayı düşünün.</translation>
     </message>
     <message>
         <source>
 
 Available commands:
 </source>
-        <translation type="unfinished"/>
+        <translation>
+
+Kullanılabilir komutlar:
+</translation>
     </message>
     <message>
         <source>Name of the command to execute.</source>
@@ -3424,11 +3453,11 @@ Available commands:
     </message>
     <message>
         <source>Find entries quickly.</source>
-        <translation type="unfinished"/>
+        <translation>Hızlıca girdi bul.</translation>
     </message>
     <message>
         <source>Search term.</source>
-        <translation type="unfinished"/>
+        <translation>Arama terimi.</translation>
     </message>
     <message>
         <source>Merge two databases.</source>
@@ -3444,7 +3473,7 @@ Available commands:
     </message>
     <message>
         <source>Use the same credentials for both database files.</source>
-        <translation type="unfinished"/>
+        <translation>Her iki veri tabanı dosyası için aynı kimliği kullan.</translation>
     </message>
     <message>
         <source>Key file of the database to merge from.</source>
@@ -3514,7 +3543,7 @@ Available commands:
     </message>
     <message>
         <source>Created</source>
-        <translation type="unfinished"/>
+        <translation>Oluşturuldu</translation>
     </message>
     <message>
         <source>Legacy Browser Integration</source>
@@ -3538,7 +3567,7 @@ Available commands:
     </message>
     <message>
         <source>SSH Agent</source>
-        <translation type="unfinished"/>
+        <translation>SSH Ajanı</translation>
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
@@ -3673,7 +3702,7 @@ Do you want to overwrite it?</source>
     </message>
     <message>
         <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"/>
+        <translation>%1 -%2 bilgilerini güncellemek istiyor musun?</translation>
     </message>
     <message>
         <source>KeePassXC: Database locked!</source>
@@ -3858,23 +3887,23 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>Startup</source>
-        <translation type="unfinished"/>
+        <translation>Başlangıç</translation>
     </message>
     <message>
         <source>File Management</source>
-        <translation type="unfinished"/>
+        <translation>Dosya Yönetimi</translation>
     </message>
     <message>
         <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation type="unfinished"/>
+        <translation>Veri tabanı dosyalarını güvenle kaydet (Dropbox vb. ile uyumsuz olabilir)</translation>
     </message>
     <message>
         <source>Backup database file before saving</source>
-        <translation type="unfinished"/>
+        <translation>Kaydetmeden önce veri tabanı dosyasını yedekle</translation>
     </message>
     <message>
         <source>Entry Management</source>
-        <translation type="unfinished"/>
+        <translation>Girdi Yönetimi</translation>
     </message>
     <message>
         <source>General</source>
@@ -3926,7 +3955,7 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>Hide entry notes by default</source>
-        <translation type="unfinished"/>
+        <translation>Girdi notlarını öntanımlı olarak gizle</translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -4054,7 +4083,7 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     <name>main</name>
     <message>
         <source>Remove an entry from the database.</source>
-        <translation type="unfinished"/>
+        <translation>Veri tabanından bir girdi kaldır.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
@@ -4062,7 +4091,7 @@ Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birin
     </message>
     <message>
         <source>Path of the entry to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Kaldırılacak girdinin yolu.</translation>
     </message>
     <message>
         <source>KeePassXC - cross-platform password manager</source>
diff --git a/share/translations/keepassx_uk.ts b/share/translations/keepassx_uk.ts
index cf43f88ff0..e112bb27c9 100644
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.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>Повідомляйте про вади на &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>Повідомляйте про помилки на &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>
@@ -49,7 +49,7 @@
     </message>
     <message>
         <source>Distribution: %1</source>
-        <translation>Розподіл: %1</translation>
+        <translation>Дистрибутив: %1</translation>
     </message>
     <message>
         <source>Libraries:</source>
@@ -103,8 +103,8 @@ Kernel: %3 %4</source>
     <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>
+        <translation>%1 запитує доступ до паролів у цих записах.
+Дозволити доступ?</translation>
     </message>
 </context>
 <context>
@@ -134,15 +134,15 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Ця команда Автозаповнення містить надзвичайно довгу затримку. Ви впевнені, що хочете продовжити?</translation>
+        <translation>Команда Автозаповнення містить надто велику затримку. Ви впевнені, що хочете продовжити?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Ця команда Автозаповнення містить надзвичайно довгі утримання клавіш. Ви впевнені, що хочете продовжити?</translation>
+        <translation>Команда Автозаповнення містить надто повільні натискання клавіш. Ви впевнені, що хочете продовжити?</translation>
     </message>
     <message>
         <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Ця команда Автозаповнення містить надзвичайно часто повторювані параметри. Ви впевнені, що хочете продовжити?</translation>
+        <translation>Команда Автозаповнення містить параметри, що надто часто повторюються. Ви впевнені, що хочете продовжити?</translation>
     </message>
 </context>
 <context>
@@ -194,7 +194,7 @@ Please select whether you want to allow access.</source>
     <name>BrowserAccessControlDialog</name>
     <message>
         <source>KeePassXC-Browser Confirm Access</source>
-        <translation>Підтвердження доступу для переглядача KeePassXC</translation>
+        <translation>Підтвердження доступу для KeePassXC-Browser</translation>
     </message>
     <message>
         <source>Remember this decision</source>
@@ -211,8 +211,8 @@ Please select whether you want to allow access.</source>
     <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>
+        <translation>%1 запитує доступ до паролів у цих записах.
+Дозволити доступ?</translation>
     </message>
 </context>
 <context>
@@ -223,11 +223,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>Це необхідно для надання переглядачу KeePassXC доступу до Ваших сховищ</translation>
+        <translation>Це необхідно для надання KeePassXC-Browser доступу до Ваших сховищ</translation>
     </message>
     <message>
         <source>Enable KeepassXC browser integration</source>
-        <translation>Сполучити KeePassXC з переглядачем</translation>
+        <translation>Увімкнути інтеграцію KeePassXC з браузером</translation>
     </message>
     <message>
         <source>General</source>
@@ -235,7 +235,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Enable integration for these browsers:</source>
-        <translation>Сполучити з такими переглядачами:</translation>
+        <translation>Увімкнути інтеграцію з цими браузерами:</translation>
     </message>
     <message>
         <source>&amp;Google Chrome</source>
@@ -290,7 +290,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>&amp;Disconnect all browsers</source>
-        <translation>Від&apos;єднати від всіх переглядачів</translation>
+        <translation>&amp;Від&apos;єднати від усіх браузерів</translation>
     </message>
     <message>
         <source>Forget all remembered &amp;permissions</source>
@@ -337,11 +337,11 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Support a proxy application between KeePassXC and browser extension.</source>
-        <translation>Підтримувати посередницькі застосунки між KeePassXC та додатками переглядача.</translation>
+        <translation>Підтримувати посередницькі додатки між KeePassXC та розширенням браузера.</translation>
     </message>
     <message>
         <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
-        <translation>Використовувати посередницький застосунок між KeePassXC та додатком переглядача</translation>
+        <translation>Використовувати посередницький додаток між KeePassXC та розширенням браузера</translation>
     </message>
     <message>
         <source>Use a custom proxy location if you installed a proxy manually.</source>
@@ -375,7 +375,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>We&apos;re sorry, but KeePassXC-Browser is not supported for Snap releases at the moment.</source>
-        <translation>Вибачте, але переглядач KeePassXC поки що не працює у версіях Snap.</translation>
+        <translation>Вибачте, але KeePassXC-Browser поки що не підтримується Snap-версіях.</translation>
     </message>
 </context>
 <context>
@@ -448,7 +448,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </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></translation>
+        <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>
@@ -464,7 +464,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entry(s).</source>
-        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
+        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -479,15 +479,15 @@ Please unlock the selected database or choose another one which is unlocked.</so
     <name>ChangeMasterKeyWidget</name>
     <message>
         <source>Password</source>
-        <translation>Гасло</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>Enter password:</source>
-        <translation>Уведіть гасло:</translation>
+        <translation>Введіть пароль:</translation>
     </message>
     <message>
         <source>Repeat password:</source>
-        <translation>Повторіть гасло:</translation>
+        <translation>Повторіть пароль:</translation>
     </message>
     <message>
         <source>&amp;Key file</source>
@@ -531,15 +531,15 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Empty password</source>
-        <translation>Порожнє гасло</translation>
+        <translation>Порожній пароль</translation>
     </message>
     <message>
         <source>Do you really want to use an empty string as password?</source>
-        <translation>Ви дійсно хочете використати порожній рядок у якості гасла?</translation>
+        <translation>Ви дійсно бажаєте використати порожній рядок як пароль?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Гасла не співпадають.</translation>
+        <translation>Паролі не співпадають.</translation>
     </message>
     <message>
         <source>Failed to set %1 as the Key file:
@@ -578,7 +578,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Replace username and password with references</source>
-        <translation>Замінити ім&apos;я користувача і гасло посиланнями</translation>
+        <translation>Замінити ім&apos;я користувача і пароль посиланнями</translation>
     </message>
     <message>
         <source>Copy history</source>
@@ -693,15 +693,15 @@ Please consider generating a new key file.</source>
     <name>CsvParserModel</name>
     <message numerus="yes">
         <source>%n byte(s), </source>
-        <translation><numerusform>%n байт,%n byte(s), </numerusform><numerusform>%n байта, </numerusform><numerusform>%n байтів, </numerusform></translation>
+        <translation><numerusform>%n байт,%n byte(s), </numerusform><numerusform>%n байта, </numerusform><numerusform>%n байтів, </numerusform><numerusform>%n байтів, </numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n row(s), </source>
-        <translation><numerusform>%n рядок, </numerusform><numerusform>%n рядка, </numerusform><numerusform>%n рядків, </numerusform></translation>
+        <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></translation>
+        <translation><numerusform>%n колонка</numerusform><numerusform>%n колонки</numerusform><numerusform>%n колонок</numerusform><numerusform>%n колонок</numerusform></translation>
     </message>
 </context>
 <context>
@@ -716,7 +716,7 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Гасло:</translation>
+        <translation>Пароль:</translation>
     </message>
     <message>
         <source>Browse</source>
@@ -861,12 +861,12 @@ If you keep this number, your database may be too easy to crack!</source>
     <message numerus="yes">
         <source> MiB</source>
         <comment>Abbreviation for Mebibytes (KDF settings)</comment>
-        <translation><numerusform>МіБ</numerusform><numerusform>МіБ</numerusform><numerusform>МіБ</numerusform></translation>
+        <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></translation>
+        <translation><numerusform>потік</numerusform><numerusform>потоки</numerusform><numerusform>потоків</numerusform><numerusform>потоків</numerusform></translation>
     </message>
 </context>
 <context>
@@ -1032,7 +1032,7 @@ Save changes?</source>
     </message>
     <message>
         <source>Passwords</source>
-        <translation>Гасла</translation>
+        <translation>Паролі</translation>
     </message>
     <message>
         <source>Save database as</source>
@@ -1123,7 +1123,7 @@ Disable safe saves and try again?</source>
     </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></translation>
+        <translation><numerusform>Ви дійсно хочете перемістити %n запис у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записи в смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записів у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записів у смітник?</numerusform></translation>
     </message>
     <message>
         <source>Execute command?</source>
@@ -1212,7 +1212,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Password</source>
-        <translation>Гасло</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>URL</source>
@@ -1343,7 +1343,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Гасла не співпадають.</translation>
+        <translation>Паролі не співпадають.</translation>
     </message>
     <message>
         <source>New attribute</source>
@@ -1371,11 +1371,11 @@ Do you want to merge your changes?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижні</numerusform><numerusform>%n тижнів</numerusform></translation>
+        <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижні</numerusform><numerusform>%n тижнів</numerusform><numerusform>%n тижнів</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n місяць</numerusform><numerusform>%n місяці</numerusform><numerusform>%n місяців</numerusform></translation>
+        <translation><numerusform>%n місяць</numerusform><numerusform>%n місяці</numerusform><numerusform>%n місяців</numerusform><numerusform>%n місяців</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
@@ -1383,11 +1383,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Apply generated password?</source>
-        <translation>Застосувати створене гасло?</translation>
+        <translation>Застосувати створений пароль?</translation>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation>Бажаєте застосувати створене гасло до цього запису?</translation>
+        <translation>Бажаєте призначити створений пароль цьому запису?</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
@@ -1495,11 +1495,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Гасло:</translation>
+        <translation>Пароль:</translation>
     </message>
     <message>
         <source>Repeat:</source>
-        <translation>Гасло ще раз:</translation>
+        <translation>Пароль ще раз:</translation>
     </message>
     <message>
         <source>Title:</source>
@@ -1819,7 +1819,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message numerus="yes">
         <source>Are you sure you want to remove %n attachment(s)?</source>
-        <translation><numerusform>Ви дійсно хочете видалити %n вкладення?</numerusform><numerusform>Ви дійсно хочете видалити %n вкладення?</numerusform><numerusform>Ви дійсно хочете видалити %n вкладень?</numerusform></translation>
+        <translation><numerusform>Ви дійсно хочете видалити %n вкладення?</numerusform><numerusform>Ви дійсно хочете видалити %n вкладення?</numerusform><numerusform>Ви дійсно хочете видалити %n вкладень?</numerusform><numerusform>Ви дійсно хочете видалити %n вкладень?</numerusform></translation>
     </message>
     <message>
         <source>Confirm Remove</source>
@@ -1923,7 +1923,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Password</source>
-        <translation>Гасло</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1962,7 +1962,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Hide Passwords</source>
-        <translation>Ховати гасла</translation>
+        <translation>Сховати паролі</translation>
     </message>
     <message>
         <source>Fit to window</source>
@@ -2047,7 +2047,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Ensure that the password contains characters from every group</source>
-        <translation>Забезпечити використання символів усіх видів у гаслі</translation>
+        <translation>Забезпечити входження до пароля символів з кожної групи</translation>
     </message>
     <message>
         <source>Extended ASCII</source>
@@ -2661,7 +2661,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Time-based one-time password</source>
-        <translation>Тимчасове одноразове гасло</translation>
+        <translation>Тимчасовий одноразовий пароль</translation>
     </message>
     <message>
         <source>&amp;Groups</source>
@@ -2757,11 +2757,11 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Cop&amp;y password</source>
-        <translation>Копіювати гасло</translation>
+        <translation>Копіювати пароль</translation>
     </message>
     <message>
         <source>Copy password to clipboard</source>
-        <translation>Копіювати гасло в кишеню</translation>
+        <translation>Копіювати пароль в буфер обміну</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
@@ -2769,7 +2769,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Password Generator</source>
-        <translation>Виробник гасел</translation>
+        <translation>Генератор паролів</translation>
     </message>
     <message>
         <source>&amp;Perform Auto-Type</source>
@@ -2849,7 +2849,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </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>
+        <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>
@@ -2944,7 +2944,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Passphrase is required to decrypt this key</source>
-        <translation>Для розшифрування цього ключа потрібен вираз гасла</translation>
+        <translation>Для розшифрування цього ключа потрібен пароль</translation>
     </message>
     <message>
         <source>Key derivation failed, key file corrupted?</source>
@@ -2952,7 +2952,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Decryption failed, wrong passphrase?</source>
-        <translation>Розшифрування зазнало невдачі, можливо, через хибний вираз гасла</translation>
+        <translation>Розшифрувати не вдалося, можливо, через хибний пароль</translation>
     </message>
     <message>
         <source>Unexpected EOF while reading public key</source>
@@ -3060,7 +3060,7 @@ This version is not meant for production use.</source>
     </message>
     <message>
         <source>Password Generator</source>
-        <translation>Виробник гасел</translation>
+        <translation>Генератор паролів</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -3108,7 +3108,7 @@ This version is not meant for production use.</source>
     </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>
+        <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>
     </message>
     <message>
         <source>Cannot bind to privileged ports</source>
@@ -3129,7 +3129,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Гасло:</translation>
+        <translation>Пароль:</translation>
     </message>
     <message>
         <source>strength</source>
@@ -3142,7 +3142,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Password</source>
-        <translation>Гасло</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>Character Types</source>
@@ -3182,7 +3182,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Passphrase</source>
-        <translation>Вираз гасла</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>Wordlist:</source>
@@ -3222,7 +3222,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Password Quality: %1</source>
-        <translation>Якість гасла: %1</translation>
+        <translation>Якість пароля: %1</translation>
     </message>
     <message>
         <source>Poor</source>
@@ -3345,15 +3345,15 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Prompt for the entry&apos;s password.</source>
-        <translation>Запросити гасло для запису.</translation>
+        <translation>Запитати введення пароля для запису.</translation>
     </message>
     <message>
         <source>Generate a password for the entry.</source>
-        <translation>Створити гасло для запису.</translation>
+        <translation>Згенерувати пароль для запису.</translation>
     </message>
     <message>
         <source>Length for the generated password.</source>
-        <translation>Довжина створюваного гасла.</translation>
+        <translation>Довжина згенерованого пароля.</translation>
     </message>
     <message>
         <source>length</source>
@@ -3365,7 +3365,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Copy an entry&apos;s password to the clipboard.</source>
-        <translation>Скопіювати гасло запису в кишеню.</translation>
+        <translation>Копіювати пароль запису до буферу обміну.</translation>
     </message>
     <message>
         <source>Path of the entry to clip.</source>
@@ -3394,15 +3394,15 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Estimate the entropy of a password.</source>
-        <translation>Підрахувати ентропію гасла.</translation>
+        <translation>Обчислити ентропію пароля.</translation>
     </message>
     <message>
         <source>Password for which to estimate the entropy.</source>
-        <translation>Гасло, для якого треба підрахувати ентропію.</translation>
+        <translation>Пароль, для якого обчислюється ентропія.</translation>
     </message>
     <message>
         <source>Perform advanced analysis on the password.</source>
-        <translation>Виконати поглиблений аналіз гасла.</translation>
+        <translation>Виконати поглиблений аналіз пароля.</translation>
     </message>
     <message>
         <source>Extract and print the content of a database.</source>
@@ -3414,7 +3414,7 @@ Using default port 19455.</source>
     </message>
     <message>
         <source>Insert password to unlock %1: </source>
-        <translation>Вставте гасло для відкриття %1:</translation>
+        <translation>Вставте пароль для відкриття %1:</translation>
     </message>
     <message>
         <source>Failed to load key file %1 : %2</source>
@@ -3532,7 +3532,7 @@ Available commands:
     </message>
     <message>
         <source>Password</source>
-        <translation>Гасло</translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -3548,11 +3548,11 @@ Available commands:
     </message>
     <message>
         <source>Legacy Browser Integration</source>
-        <translation>Застарілий тип підключення до переглядача</translation>
+        <translation>Застарілий спосіб інтеграції з браузером</translation>
     </message>
     <message>
         <source>Browser Integration</source>
-        <translation>Підключення до переглядача</translation>
+        <translation>Інтеграція з браузером</translation>
     </message>
     <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
@@ -3572,11 +3572,11 @@ Available commands:
     </message>
     <message>
         <source>Generate a new random diceware passphrase.</source>
-        <translation>Створити новий вираз гасла методом гральних кісточок (diceware).</translation>
+        <translation>Генерувати новий пароль методом гральних кісток (diceware).</translation>
     </message>
     <message>
         <source>Word count for the diceware passphrase.</source>
-        <translation>Кількість слів у виразі гасла.</translation>
+        <translation>Кількість слів у паролі.</translation>
     </message>
     <message>
         <source>count</source>
@@ -3585,36 +3585,36 @@ Available commands:
     <message>
         <source>Wordlist for the diceware generator.
 [Default: EFF English]</source>
-        <translation>Список слів для виробника гасел методом diceware.
+        <translation>Список слів для генератора паролів методом diceware.
 [Типово: англійська версія EFF]</translation>
     </message>
     <message>
         <source>Generate a new random password.</source>
-        <translation>Створити нове випадкове гасло.</translation>
+        <translation>Згенерувати новий випадковий пароль.</translation>
     </message>
     <message>
         <source>Length of the generated password.</source>
-        <translation>Довжина створюваного гасла.</translation>
+        <translation>Довжина генерованого пароля.</translation>
     </message>
     <message>
         <source>Use lowercase characters in the generated password.</source>
-        <translation>Використовувати малі літери для створення гасла.</translation>
+        <translation>Використовувати малі літери в генерації пароля.</translation>
     </message>
     <message>
         <source>Use uppercase characters in the generated password.</source>
-        <translation>Використовувати великі літери для створення гасла.</translation>
+        <translation>Використовувати великі літери в генерації пароля.</translation>
     </message>
     <message>
         <source>Use numbers in the generated password.</source>
-        <translation>Використовувати числа для створення гасла.</translation>
+        <translation>Використовувати цифри в генерації пароля.</translation>
     </message>
     <message>
         <source>Use special characters in the generated password.</source>
-        <translation>Використовувати спеціальні символи для створення гасла.</translation>
+        <translation>Використовувати спеціальні символи в генерації пароля.</translation>
     </message>
     <message>
         <source>Use extended ASCII in the generated password.</source>
-        <translation>Використовувати розширені ASCII для створення гасла.</translation>
+        <translation>Використовувати розширений набір ASCII в генерації пароля.</translation>
     </message>
 </context>
 <context>
@@ -3722,7 +3722,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </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></translation>
+        <translation><numerusform>Успішно видалено %n шифрувальний ключ з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключа з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з HTTP налаштувань KeePassX.</numerusform><numerusform>Успішно видалено %n шифрувальних ключів з HTTP налаштувань KeePassX.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -3754,7 +3754,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message numerus="yes">
         <source>Successfully removed permissions from %n entries.</source>
-        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
+        <translation><numerusform>Успішно видалено привілеї для %n запису.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform><numerusform>Успішно видалено привілеї для %n записів.</numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
@@ -3945,15 +3945,15 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
-        <translation>Не запитувати підтвердження гасла, якщо воно не приховане</translation>
+        <translation>Не запитувати підтвердження пароля, якщо він не приховується</translation>
     </message>
     <message>
         <source>Show passwords in cleartext by default</source>
-        <translation>Типово показувати гасло у відкритому вигляді</translation>
+        <translation>Типово показувати паролі у відкритому вигляді</translation>
     </message>
     <message>
         <source>Hide passwords in the preview panel</source>
-        <translation>Ховати гасла у панелі перегляду</translation>
+        <translation>Приховувати паролі у панелі перегляду</translation>
     </message>
     <message>
         <source>Hide entry notes by default</source>
@@ -4024,7 +4024,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     <name>TotpDialog</name>
     <message>
         <source>Timed Password</source>
-        <translation>Тимчасове гасло</translation>
+        <translation>Тимчасовий пароль</translation>
     </message>
     <message>
         <source>000000</source>
@@ -4054,7 +4054,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     <name>WelcomeWidget</name>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation>Почніть надійно і безпечно зберігати ваші гасла у сховищі KeePassXC</translation>
+        <translation>Почніть надійно і безпечно зберігати ваші паролі у сховищі KeePassXC</translation>
     </message>
     <message>
         <source>Create new database</source>
@@ -4097,7 +4097,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – багатоплатформовий керманич гасел</translation>
+        <translation>KeePassXC – кросплатформний менеджер паролів</translation>
     </message>
     <message>
         <source>filenames of the password databases to open (*.kdbx)</source>
@@ -4113,7 +4113,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>read password of the database from stdin</source>
-        <translation>прочитати гасло для сховища зі stdin</translation>
+        <translation>отримати пароль до сховища із stdin</translation>
     </message>
     <message>
         <source>Parent window handle</source>
diff --git a/share/translations/keepassx_zh_CN.ts b/share/translations/keepassx_zh_CN.ts
index ad90b9e8a3..25253c508e 100644
--- a/share/translations/keepassx_zh_CN.ts
+++ b/share/translations/keepassx_zh_CN.ts
@@ -370,11 +370,11 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Select custom proxy location</source>
-        <translation type="unfinished"/>
+        <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"/>
+        <translation>非常抱歉，KeePassXC-Browser 当前不支持 Snap 发行包</translation>
     </message>
 </context>
 <context>
@@ -388,11 +388,14 @@ Please select whether you want to allow access.</source>
 
 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>你已收到上述密钥的关联请求。
+
+如果你想允许它访问你的 KeePassXC 数据库，
+请为它提供一个唯一的名称来识别并接受它。</translation>
     </message>
     <message>
         <source>Save and allow access</source>
-        <translation type="unfinished"/>
+        <translation>保存并允许访问</translation>
     </message>
     <message>
         <source>KeePassXC: Overwrite existing key?</source>
@@ -401,7 +404,8 @@ give it a unique name to identify and accept it.</source>
     <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>一个名为“%1”共享的加密密钥已存在。
+确认要覆盖它吗？</translation>
     </message>
     <message>
         <source>KeePassXC: Update Entry</source>
@@ -427,7 +431,7 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>The active database does not contain a settings entry.</source>
-        <translation type="unfinished"/>
+        <translation>当前数据库中不包含设置的条目。</translation>
     </message>
     <message>
         <source>KeePassXC: No keys found</source>
@@ -544,14 +548,16 @@ Please unlock the selected database or choose another one which is unlocked.</so
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"/>
+        <translation>旧式密钥文件格式</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>您使用的是旧式密钥文件格式，将来可能会不再被支持。
+
+请考虑生成一个新的密钥文件。</translation>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -732,18 +738,20 @@ Please consider generating a new key file.</source>
     </message>
     <message>
         <source>Legacy key file format</source>
-        <translation type="unfinished"/>
+        <translation>旧式密钥文件格式</translation>
     </message>
     <message>
         <source>You are using a legacy key file format which may become
 unsupported in the future.
 
 Please consider generating a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>您使用的是旧式密钥文件格式，将来可能会不再被支持。
+
+请考虑生成一个新的密钥文件。</translation>
     </message>
     <message>
         <source>Don&apos;t show this warning again</source>
-        <translation type="unfinished"/>
+        <translation>不再显示此警告</translation>
     </message>
     <message>
         <source>All files</source>
@@ -870,7 +878,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Key Derivation Function:</source>
-        <translation type="unfinished"/>
+        <translation>密钥派生函数:</translation>
     </message>
     <message>
         <source>Transform rounds:</source>
@@ -929,11 +937,11 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Additional Database Settings</source>
-        <translation type="unfinished"/>
+        <translation>其他数据库设置</translation>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
-        <translation type="unfinished"/>
+        <translation>启用压缩 (推荐)</translation>
     </message>
 </context>
 <context>
@@ -1151,7 +1159,7 @@ Disable safe saves and try again?</source>
     </message>
     <message>
         <source>File has changed</source>
-        <translation type="unfinished"/>
+        <translation>文件已变更</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -1183,7 +1191,7 @@ Do you want to merge your changes?</source>
     <name>DetailsWidget</name>
     <message>
         <source>Generate TOTP Token</source>
-        <translation type="unfinished"/>
+        <translation>生成 TOTP 令牌</translation>
     </message>
     <message>
         <source>Close</source>
@@ -1203,7 +1211,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Expiration</source>
-        <translation type="unfinished"/>
+        <translation>过期时间</translation>
     </message>
     <message>
         <source>Username</source>
@@ -1219,7 +1227,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Attributes</source>
-        <translation type="unfinished"/>
+        <translation>添加属性</translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -1247,11 +1255,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"/>
+        <translation>从不</translation>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
+        <translation>[受保护的内容]</translation>
     </message>
     <message>
         <source>Disabled</source>
@@ -1298,15 +1306,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>(encrypted)</source>
-        <translation type="unfinished"/>
+        <translation>（已加密）</translation>
     </message>
     <message>
         <source>Select private key</source>
-        <translation type="unfinished"/>
+        <translation>选择私钥文件</translation>
     </message>
     <message>
         <source>File too large to be a private key</source>
-        <translation type="unfinished"/>
+        <translation>作为一个私钥来说，这个文件太大了。</translation>
     </message>
     <message>
         <source>Failed to open private key</source>
@@ -1342,7 +1350,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>[PROTECTED]</source>
-        <translation type="unfinished"/>
+        <translation>[受保护的内容]</translation>
     </message>
     <message>
         <source>Press reveal to view or edit</source>
@@ -1366,15 +1374,15 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Apply generated password?</source>
-        <translation type="unfinished"/>
+        <translation>是否应用生成的密码？</translation>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation type="unfinished"/>
+        <translation>是否将生成的密码应用于此项目？</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
-        <translation type="unfinished"/>
+        <translation>项目已成功更新。</translation>
     </message>
 </context>
 <context>
@@ -1409,11 +1417,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Foreground Color:</source>
-        <translation type="unfinished"/>
+        <translation>前景色:</translation>
     </message>
     <message>
         <source>Background Color:</source>
-        <translation type="unfinished"/>
+        <translation>背景色:</translation>
     </message>
 </context>
 <context>
@@ -1545,7 +1553,7 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Decrypt</source>
-        <translation type="unfinished"/>
+        <translation>解密</translation>
     </message>
     <message>
         <source>n/a</source>
@@ -1837,12 +1845,12 @@ This may cause the affected plugins to malfunction.</source>
     <message>
         <source>Unable to open attachments:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>无法打开附件：%1</translation>
     </message>
     <message>
         <source>Unable to open files:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>无法打开文件：%1</translation>
     </message>
 </context>
 <context>
@@ -1896,7 +1904,7 @@ This may cause the affected plugins to malfunction.</source>
     </message>
     <message>
         <source>Never</source>
-        <translation type="unfinished"/>
+        <translation>从不</translation>
     </message>
     <message>
         <source>Password</source>
@@ -2348,7 +2356,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
     </message>
     <message>
         <source>Duplicate custom attribute found</source>
-        <translation type="unfinished"/>
+        <translation>找到重复的自定义属性</translation>
     </message>
     <message>
         <source>Entry string key or value missing</source>
diff --git a/share/translations/keepassx_zh_TW.ts b/share/translations/keepassx_zh_TW.ts
index 7adcdd8b87..6e9c7622c4 100644
--- a/share/translations/keepassx_zh_TW.ts
+++ b/share/translations/keepassx_zh_TW.ts
@@ -944,7 +944,7 @@ If you keep this number, your database may be too easy to crack!</source>
     </message>
     <message>
         <source>Enable &amp;compression (recommended)</source>
-        <translation type="unfinished"/>
+        <translation>啟用&amp;壓縮 (推薦)</translation>
     </message>
 </context>
 <context>
@@ -1382,11 +1382,11 @@ Do you want to merge your changes?</source>
     </message>
     <message>
         <source>Do you want to apply the generated password to this entry?</source>
-        <translation type="unfinished"/>
+        <translation>是否要把產生的密碼應用到此項目？</translation>
     </message>
     <message>
         <source>Entry updated successfully.</source>
-        <translation type="unfinished"/>
+        <translation>項目已成功更新。</translation>
     </message>
 </context>
 <context>