Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor typos (#10124)

Browse Source
This commit is contained in:
spaette 2023-12-22 14:12:07 -06:00 committed by GitHub
parent 681a0f5638
commit 9e119230d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -79,7 +79,7 @@
- Browser: Revert code causing connection problems [#8665]
- 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]
## 2.7.3 (2022-10-23)

2
CMakeLists.txt
View File

@ -310,7 +310,7 @@ if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
check_add_gcc_compiler_flag("-Wshadow-compatible-local")
check_add_gcc_compiler_flag("-Wshadow-local")
add_gcc_compiler_flags("-Werror")
# This is needed since compiling aginst Botan3 requires compiling against C++20
# This is needed since compiling against Botan3 requires compiling against C++20
if(WITH_XC_BOTAN3)
add_gcc_compiler_cxxflags("-Wno-error=deprecated-enum-enum-conversion -Wno-error=deprecated")
endif()

2
share/linux/org.keepassxc.KeePassXC.appdata.xml
View File

@ -126,7 +126,7 @@
<li>Browser: Revert code causing connection problems [#8665]</li>
<li>Browser: Fix socket file symbolic link on Linux [#8656]</li>
<li>Flatpak: Fix launching browser proxy service [#8680]</li>
<li>SSH Agent: Fix paegent support on Windows [#8619]</li>
<li>SSH Agent: Fix pageant support on Windows [#8619]</li>
</ul>
</description>
</release>

2
share/translations/keepassxc_en.ts
View File

@ -6450,7 +6450,7 @@ Do you want to overwrite it?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle password visibilty using Control + H. Open the password generator using Control + G.</source>
<source>Toggle password visibility using Control + H. Open the password generator using Control + G.</source>
<translation type="unfinished"></translation>
</message>
</context>

2
src/core/Entry.cpp
View File

@ -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) {

2
src/core/Metadata.cpp
View File

@ -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;

2
src/gui/PasswordWidget.ui
View File

@ -29,7 +29,7 @@
<item>
<widget class="QLineEdit" name="passwordEdit">
<property name="accessibleDescription">
<string>Toggle password visibilty using Control + H. Open the password generator using Control + G.</string>
<string>Toggle password visibility using Control + H. Open the password generator using Control + G.</string>
</property>
</widget>
</item>

4
src/gui/styles/base/BaseStyle.cpp
View File

@ -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());

2
src/gui/styles/base/phantomcolor.h
View File

@ -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);

2
src/keeshare/ShareExport.cpp
View File

@ -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);

2
tests/TestEntrySearcher.cpp
View File

@ -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);

6
tests/TestMerge.cpp
View File

@ -533,7 +533,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>
// 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<QString, QUuid>
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);
}