Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
deining authored and droidmonkey committed Aug 9, 2024
1 parent 05112e5 commit 14619cb
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions docs/topics/BrowserPlugin.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ You can then choose to update/add the credentials to your KeePassXC database dir

1. Ensure your database is unlocked and configured to use the Browser extension as shown above.

2. Right click on a password field and from the KeePassXC sub-menu choose _Show Password Generater_. The standard KeePassXC password generator will appear.
2. Right click on a password field and from the KeePassXC sub-menu choose _Show Password Generator_. The standard KeePassXC password generator will appear.

3. Configure the password generation options and click _Apply Password_ when done. The generated password will be filled into the previously selected field.

4. When you have succussfully submitted the password on the website, a popup will appear asking you to either udpate an existing entry or add a new one.
4. When you have successfully submitted the password on the website, a popup will appear asking you to either update an existing entry or add a new one.

// tag::advanced[]
=== Browser statistics
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ if(WIN32)
endif()
endif()

# Main Executable Defintion
# Main Executable Definition
if(WIN32)
include(GenerateProductVersion)
generate_product_version(
Expand Down
2 changes: 1 addition & 1 deletion src/core/Bootstrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ namespace Bootstrap
goto Cleanup;
}

// Retrieve CreaterOwnerRights SID
// Retrieve CreatorOwnerRights SID
pOwnerRightsSid = static_cast<PSID>(HeapAlloc(GetProcessHeap(), 0, pOwnerRightsSidSize));
if (pOwnerRightsSid == nullptr) {
goto Cleanup;
Expand Down
4 changes: 2 additions & 2 deletions src/core/Merger.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class Merger : public QObject
bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod, const int maxItems);
void moveEntry(Entry* entry, Group* targetGroup);
void moveGroup(Group* group, Group* targetGroup);
// remove an entry without a trace in the deletedObjects - needed for elemination cloned entries
// remove an entry without a trace in the deletedObjects - needed for elimination of cloned entries
void eraseEntry(Entry* entry);
// remove an entry without a trace in the deletedObjects - needed for elemination cloned entries
// remove an entry without a trace in the deletedObjects - needed for elimination of cloned entries
void eraseGroup(Group* group);
ChangeList resolveEntryConflict(const MergeContext& context, const Entry* existingEntry, Entry* otherEntry);
ChangeList resolveGroupConflict(const MergeContext& context, const Group* existingGroup, Group* otherGroup);
Expand Down
12 changes: 6 additions & 6 deletions src/crypto/SymmetricCipher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ bool SymmetricCipher::init(Mode mode, Direction direction, const QByteArray& key
return true;
}

bool SymmetricCipher::isInitalized() const
bool SymmetricCipher::isInitialized() const
{
return m_cipher;
}

bool SymmetricCipher::process(char* data, int len)
{
Q_ASSERT(isInitalized());
if (!isInitalized()) {
Q_ASSERT(isInitialized());
if (!isInitialized()) {
m_error = QObject::tr("Cipher not initialized prior to use.");
return false;
}
Expand All @@ -97,8 +97,8 @@ bool SymmetricCipher::process(QByteArray& data)

bool SymmetricCipher::finish(QByteArray& data)
{
Q_ASSERT(isInitalized());
if (!isInitalized()) {
Q_ASSERT(isInitialized());
if (!isInitialized()) {
m_error = QObject::tr("Cipher not initialized prior to use.");
return false;
}
Expand All @@ -121,7 +121,7 @@ bool SymmetricCipher::finish(QByteArray& data)
void SymmetricCipher::reset()
{
m_error.clear();
if (isInitalized()) {
if (isInitialized()) {
m_cipher.reset();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/SymmetricCipher.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class SymmetricCipher
explicit SymmetricCipher() = default;
~SymmetricCipher() = default;

bool isInitalized() const;
bool isInitialized() const;
Q_REQUIRED_RESULT bool init(Mode mode, Direction direction, const QByteArray& key, const QByteArray& iv);
Q_REQUIRED_RESULT bool process(char* data, int len);
Q_REQUIRED_RESULT bool process(QByteArray& data);
Expand Down
2 changes: 1 addition & 1 deletion src/format/OpData01.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/*!
* Packages and transports the AgileBits data structure called \c OpData01
* used to encypt and provide HMAC for encrypted data.
* used to encrypt and provide HMAC for encrypted data.
* \sa https://support.1password.com/opvault-design/#opdata01
*/
class OpData01 : public QObject
Expand Down
2 changes: 1 addition & 1 deletion src/gui/EditWidgetProperties.ui
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelModfied">
<widget class="QLabel" name="labelModified">
<property name="text">
<string>Modified:</string>
</property>
Expand Down
4 changes: 2 additions & 2 deletions src/gui/IconDownloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ void IconDownloader::setUrl(const QString& entryUrl)
// Determine if host portion of URL is an IP address by resolving it and
// searching for a match with the returned address(es).
bool hostIsIp = false;
QList<QHostAddress> hostAddressess = QHostInfo::fromName(fullyQualifiedDomain).addresses();
QList<QHostAddress> hostAddresses = QHostInfo::fromName(fullyQualifiedDomain).addresses();
hostIsIp =
std::any_of(hostAddressess.begin(), hostAddressess.end(), [&fullyQualifiedDomain](const QHostAddress& addr) {
std::any_of(hostAddresses.begin(), hostAddresses.end(), [&fullyQualifiedDomain](const QHostAddress& addr) {
return addr.toString() == fullyQualifiedDomain;
});

Expand Down
6 changes: 3 additions & 3 deletions src/gui/Icons.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ QIcon Icons::trayIcon(bool unlocked)
suffix = "-locked";
}

auto iconApperance = trayIconAppearance();
if (!iconApperance.startsWith("monochrome")) {
auto iconAppearance = trayIconAppearance();
if (!iconAppearance.startsWith("monochrome")) {
return icon(QString("%1%2").arg(applicationIconName(), suffix), false);
}

Expand All @@ -99,7 +99,7 @@ QIcon Icons::trayIcon(bool unlocked)
i = icon(QString("keepassxc-monochrome-dark%1").arg(suffix), false);
}
#else
i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, suffix), false);
i = icon(QString("%1-%2%3").arg(applicationIconName(), iconAppearance, suffix), false);
#endif
// Set as mask to allow the operating system to recolour the tray icon. This may look weird
// if we failed to detect the status bar background colour correctly, but it is certainly
Expand Down
2 changes: 1 addition & 1 deletion src/gui/SearchWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ bool SearchWidget::eventFilter(QObject* obj, QEvent* event)
} else if (keyEvent->matches(QKeySequence::Copy)) {
// If the system Copy shortcut (typically Ctrl+C or Cmd+C) is pressed
// in the search edit when no text is selected, route the event to the
// main window. With the default shorcut configuration, this will copy
// main window. With the default shortcut configuration, this will copy
// the password of the current entry to the clipboard.
if (!m_ui->searchEdit->hasSelectedText()) {
// Prevent infinite recursion, in case the main window ends up
Expand Down
2 changes: 1 addition & 1 deletion src/gui/reports/ReportsWidgetHibp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ void ReportsWidgetHibp::makeHibpTable()
}
}

// Sort decending by the number the password has been exposed
// Sort descending by the number the password has been exposed
std::sort(items.begin(), items.end(), [](QPair<Entry*, int>& lhs, QPair<Entry*, int>& rhs) {
return lhs.second > rhs.second;
});
Expand Down
2 changes: 1 addition & 1 deletion src/quickunlock/Polkit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Polkit::Polkit()
PolkitSubject::registerMetaType();
PolkitAuthorizationResults::registerMetaType();

/* Note we explicitly use our own dbus path here, as the ::systemBus() method could be overriden
/* Note we explicitly use our own dbus path here, as the ::systemBus() method could be overridden
through an environment variable to return an alternative bus path. This bus could have an application
pretending to be polkit running on it, which could approve every authentication request
Expand Down
2 changes: 1 addition & 1 deletion src/thirdparty/ykcore/ykcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ int yk_get_status(YK_KEY *k, YK_STATUS *status)
}

/* Read the factory programmed serial number from a YubiKey.
* The possibility to retreive the serial number might be disabled
* The possibility to retrieve the serial number might be disabled
* using configuration, so it should not be considered a fatal error
* to not be able to read the serial number using this function.
*
Expand Down
4 changes: 2 additions & 2 deletions src/thirdparty/ykcore/ykcore.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ extern int yk_release(void);
* Functions to get and release the key itself.
*
****/
/* opens first key available. For backwards compatability */
/* opens first key available. For backwards compatibility */
extern YK_KEY *yk_open_first_key(void);
extern YK_KEY *yk_open_key(int); /* opens nth key available */
extern YK_KEY *yk_open_key_vid_pid(const int*, size_t, const int*, size_t, int);
Expand Down Expand Up @@ -147,7 +147,7 @@ int yk_write_device_info(YK_KEY *yk, unsigned char *buf, unsigned int len);

/*************************************************************************
*
* Error handling fuctions
* Error handling functions
*
****/
extern int * _yk_errno_location(void);
Expand Down
2 changes: 1 addition & 1 deletion src/thirdparty/ykcore/ykcore_lcl.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
**
** = = = = = = = = = B I G F A T W A R N I N G = = = = = = = = =
**
** DO NOT USE THE FOLLOWING FUCTIONS DIRECTLY UNLESS YOU WRITE CORE ROUTINES!
** DO NOT USE THE FOLLOWING FUNCTIONS DIRECTLY UNLESS YOU WRITE CORE ROUTINES!
**
** These functions are declared here only to make sure they get defined
** correctly internally.
Expand Down
4 changes: 2 additions & 2 deletions src/thirdparty/ykcore/ykdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ struct config_st {
/* Yubikey 2 and above */
#define CFGFLAG_SHORT_TICKET 0x02 /* Send truncated ticket (half length) */
#define CFGFLAG_STRONG_PW1 0x10 /* Strong password policy flag #1 (mixed case) */
#define CFGFLAG_STRONG_PW2 0x40 /* Strong password policy flag #2 (subtitute 0..7 to digits) */
#define CFGFLAG_STRONG_PW2 0x40 /* Strong password policy flag #2 (substitute 0..7 to digits) */
#define CFGFLAG_MAN_UPDATE 0x80 /* Allow manual (local) update of static OTP */

/* Yubikey 2.1 and above */
Expand Down Expand Up @@ -299,7 +299,7 @@ struct status_st {
#define YK4_CAPA_TAG 0x01 /* TAG for capabilities */
#define YK4_SERIAL_TAG 0x02 /* TAG for serial number */

#define YK4_CAPA1_OTP 0x01 /* Capability bit for OTP functonality */
#define YK4_CAPA1_OTP 0x01 /* Capability bit for OTP functionality */
#define YK4_CAPA1_U2F 0x02 /* Capability bit for U2F functionality */
#define YK4_CAPA1_CCID 0x04 /* Capability bit for CCID functionality */
#define YK4_CAPA1_OPGP 0x08 /* Capability bit for OpenPGP functionality */
Expand Down
4 changes: 2 additions & 2 deletions src/thirdparty/zxcvbn/zxcvbn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ static const char *Formats[] =
0
};
/* Possible separator characters that could be used */
static const char DateSeperators[] = "/\\-_. ";
static const char DateSeparators[] = "/\\-_. ";

/**********************************************************************************
* Try to match the password with the formats above.
Expand Down Expand Up @@ -1273,7 +1273,7 @@ static void DateMatch(ZxcMatch_t **Result, const uint8_t *Passwd, int Start, int
{
if (*Fmt == '?')
{
if (!Sep && strchr(DateSeperators, *p))
if (!Sep && strchr(DateSeparators, *p))
Sep = *p;
Fail = (*p != Sep);
}
Expand Down

0 comments on commit 14619cb

Please sign in to comment.