Merge 7781a199cbb87767f7977fec222a10d699cd0874 into af2479da8dc0ff0c7104c4ccde1715b1c562dfdc

cmake/FindPCSC.cmake

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

docs/topics/DatabaseOperations.adoc

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

share/translations/keepassxc_en.ts

@@ -2245,10 +2245,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>
@@ -2257,10 +2253,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>
@@ -2277,6 +2269,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>

src/gui/Application.cpp

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

src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui

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

src/quickunlock/TouchID.mm

@@ -139,7 +139,7 @@ bool TouchID::setKey(const QUuid& dbUuid, const QByteArray& passwordKey, const b
     // 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