Browser: Fix socket file symbolic link on Linux [#8656]
Flatpak: Fix launching browser proxy service [#8680]
-
SSH Agent: Fix paegent support on Windows [#8619]
+
SSH Agent: Fix pageant support on Windows [#8619]
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 909bb39db..cfe1536cf 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -6450,7 +6450,7 @@ Do you want to overwrite it?
- Toggle password visibilty using Control + H. Open the password generator using Control + G.
+ Toggle password visibility using Control + H. Open the password generator using Control + G.
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 973aa189d..4ae6b091c 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -1549,7 +1549,7 @@ bool EntryData::equals(const EntryData& other, CompareItemOptions options) const
return false;
}
} else if (totpSettings.isNull() != other.totpSettings.isNull()) {
- // The existance of TOTP has changed between these entries
+ // The existence of TOTP has changed between these entries
return false;
}
if (::compare(excludeFromReports, other.excludeFromReports, options) != 0) {
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index c3d4b8e1b..8e714e0f2 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -279,7 +279,7 @@ int Metadata::autosaveDelayMin() const
// data is not set yet, use default
return Metadata::DefaultAutosaveDelayMin;
}
- bool ok; // check for QString to int op failuer
+ bool ok; // check for QString to int op failure
int autosaveDelayMin = autosaveDelayMinStr.toInt(&ok);
Q_ASSERT(ok);
return autosaveDelayMin;
diff --git a/src/gui/PasswordWidget.ui b/src/gui/PasswordWidget.ui
index 34cae29e1..97fe71e08 100644
--- a/src/gui/PasswordWidget.ui
+++ b/src/gui/PasswordWidget.ui
@@ -29,7 +29,7 @@
- Toggle password visibilty using Control + H. Open the password generator using Control + G.
+ Toggle password visibility using Control + H. Open the password generator using Control + G.
diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp
index 5938d5d04..3b7c56291 100644
--- a/src/gui/styles/base/BaseStyle.cpp
+++ b/src/gui/styles/base/BaseStyle.cpp
@@ -593,7 +593,7 @@ namespace Phantom
} else {
// Remove the oldest guy from the cache. Remember that because we may
// re-enter QStyle functions multiple times when drawing or calculating
- // something, we may have to load several swaitches derived from
+ // something, we may have to load several switches derived from
// different QPalettes on different stack frames at the same time. But as
// an extra cost-savings measure, we'll check and see if something else
// has a reference to the removed guy. If there aren't any references to
@@ -2770,7 +2770,7 @@ void BaseStyle::drawControl(ControlElement element,
// that when it is resolved against the device, this font will win. This
// is mainly to handle cases where someone sets the font on the window
// and then the combo inherits it and passes it onward. At that point the
- // resolve mask is very, very weak. This makes it stonger.
+ // resolve mask is very, very weak. This makes it stronger.
#if 0
QFont font = menuItem->font;
font.setPointSizeF(QFontInfo(menuItem->font).pointSizeF());
diff --git a/src/gui/styles/base/phantomcolor.h b/src/gui/styles/base/phantomcolor.h
index b99761e9f..8eed357ab 100644
--- a/src/gui/styles/base/phantomcolor.h
+++ b/src/gui/styles/base/phantomcolor.h
@@ -109,7 +109,7 @@ namespace Phantom
return (1.0 - a) * x + a * y;
}
- // Linearly interpolate two QColors after trasnforming them to linear color
+ // Linearly interpolate two QColors after transforming them to linear color
// space, treating the QColor values as if they were in sRGB space. The
// returned QColor is converted back to sRGB space.
QColor lerpQColor(const QColor& x, const QColor& y, qreal a);
diff --git a/src/keeshare/ShareExport.cpp b/src/keeshare/ShareExport.cpp
index 33328cfab..18a971418 100644
--- a/src/keeshare/ShareExport.cpp
+++ b/src/keeshare/ShareExport.cpp
@@ -53,7 +53,7 @@ namespace
continue;
}
// We could do more sophisticated **** trying to point the reference to the next in-scope reference
- // but those cases with high propability constructed examples and very rare in real usage
+ // but those cases with high probability constructed examples and very rare in real usage
const auto* sourceReference = sourceDb->rootGroup()->findEntryByUuid(targetEntry->uuid());
const auto resolvedValue = sourceReference->resolveMultiplePlaceholders(standardValue);
targetEntry->setUpdateTimeinfo(false);
diff --git a/tests/TestEntrySearcher.cpp b/tests/TestEntrySearcher.cpp
index 09d06cd31..7a7e45323 100644
--- a/tests/TestEntrySearcher.cpp
+++ b/tests/TestEntrySearcher.cpp
@@ -364,7 +364,7 @@ void TestEntrySearcher::testSkipProtected()
m_entrySearcher.search("_testProtected:apple _testAttribute:testE1 _testAttribute:testE2", m_rootGroup);
QCOMPARE(m_searchResult, {});
- // also move the protected term around to execurise the short-circut logic
+ // also move the protected term around to exercise the short-circuit logic
m_searchResult = m_entrySearcher.search("_testAttribute:testE2 _testProtected:apple", m_rootGroup);
QCOMPARE(m_searchResult, expectE2);
m_searchResult = m_entrySearcher.search("_testAttribute:testE1 _testProtected:apple", m_rootGroup);
diff --git a/tests/TestMerge.cpp b/tests/TestMerge.cpp
index 118027956..fb9b32b43 100644
--- a/tests/TestMerge.cpp
+++ b/tests/TestMerge.cpp
@@ -533,7 +533,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap
// newer deletion in source forces deletion
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
- // newer change in source privents deletion
+ // newer change in source prevents deletion
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
QVERIFY(!db->containsDeletedObject(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
// newer deletion in target forces deletion
@@ -549,7 +549,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap
QVERIFY(db->containsDeletedObject(identifiers["GroupDeletedInSourceAfterEntryUpdatedInTarget"]));
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
- // newer change in source privents deletion
+ // newer change in source prevents deletion
QVERIFY(mergedRootGroup->findGroupByUuid(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
QVERIFY(!db->containsDeletedObject(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeEntryUpdatedInSource"]));
@@ -890,7 +890,7 @@ void TestMerge::testUpdateEntryDifferentLocation()
QCOMPARE(entryDestinationMerged->username(), QString("username"));
QCOMPARE(entryDestinationMerged->group()->name(), QString("group3"));
QCOMPARE(uuidBeforeSyncing, entryDestinationMerged->uuid());
- // default merge strategie is KeepNewer - therefore the older location is used!
+ // default merge strategy is KeepNewer - therefore the older location is used!
QCOMPARE(entryDestinationMerged->timeInfo().locationChanged(), sourceLocationChanged);
}