Skip to content

Fix various typos #11839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/FindPCSC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(NOT PCSC_FOUND)

# Additional search paths for Windows if not running in Visual Studio environment
if (WIN32)
# Resolve the ambiguity of using two names for one architechture
# Resolve the ambiguity of using two names for one architecture
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x64")
set(ARCH_DIR "x64")
else()
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/DatabaseOperations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ image::database_settings.png[]
* *Database name:* This is the default identifier for your database and is shown in the tab bar and title bar (when active). You can change this name as desired.
* *Database description:* Provide some meaningful description for your database.
* *Default username:* Provide a default username for all new entries that you create in this database.
* *Public Databse Metadata:* Here you can set a public (unencrypted) name, icon, and color for your database. This is used on the database unlock screen to help distinguish multiple databases from each other.
* *Public Database Metadata:* Here you can set a public (unencrypted) name, icon, and color for your database. This is used on the database unlock screen to help distinguish multiple databases from each other.
* *Max history items:* This is the maximum number of history items that are stored for each entry. When you set this to 0, no history will be saved. Set this value to a low value to prevent the database from getting too large (we recommend no more than 10).
* *Max. history size:* When the history of an entry gets above this size, it is truncated. For example, this happens when entries have large attachments. Set this value small to prevent the database from getting too large (we recommend 6 MiB).
* *Use recycle bin:* Select this check-box if you want deleted entries to move to the recycle bin instead of being permanently removed. The recycle bin will be created if it does not already exist after your first deletion. To delete entries permanently, you must empty the recycle bin manually.
Expand Down
16 changes: 8 additions & 8 deletions share/translations/keepassxc_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2241,10 +2241,6 @@ removed from the database.</source>
<source>Display name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Publically visible display name used on the unlock dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database public display name</source>
<translation type="unfinished"></translation>
Expand All @@ -2253,10 +2249,6 @@ removed from the database.</source>
<source>Display color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Publically visible color used on the unlock dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database public display color chooser</source>
<translation type="unfinished"></translation>
Expand All @@ -2273,6 +2265,14 @@ removed from the database.</source>
<source>Select Database Icon</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Publicly visible display name used on the unlock dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Publicly visible color used on the unlock dialog</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DatabaseSettingsWidgetKeeShare</name>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Application::Application(int& argc, char** argv)
.toUtf8()
.constData();

// forceably reset the lock file
// forcibly reset the lock file
m_lockFile->removeStaleLockFile();
m_lockFile->tryLock();
// start the listen server
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<item row="0" column="1">
<widget class="QLineEdit" name="dbPublicName">
<property name="toolTip">
<string>Publically visible display name used on the unlock dialog</string>
<string>Publicly visible display name used on the unlock dialog</string>
</property>
<property name="accessibleName">
<string>Database public display name</string>
Expand All @@ -150,7 +150,7 @@
</size>
</property>
<property name="toolTip">
<string>Publically visible color used on the unlock dialog</string>
<string>Publicly visible color used on the unlock dialog</string>
</property>
<property name="accessibleName">
<string>Database public display color chooser</string>
Expand Down
2 changes: 1 addition & 1 deletion src/quickunlock/TouchID.mm
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ inline CFMutableDictionaryRef makeDictionary() {
// At least on a Hackintosh the enrolled-check does not work, there LAErrorBiometryNotAvailable gets returned instead of
// LAErrorBiometryNotEnrolled.
//
// Thats kinda unfortunate, because now you cannot know for sure if TouchID hardware is either temporarily unavailable or not present
// That's kinda unfortunate, because now you cannot know for sure if TouchID hardware is either temporarily unavailable or not present
// at all, because LAErrorBiometryNotAvailable is used for both cases.
//
// So to make quick unlock fallbacks possible on these machines you have to try to save the key a second time without this flag, if the
Expand Down