Merge pull request #5859 from nextcloud/backport/5763/stable-3.9

[stable-3.9] Fix typos found by codespell

admin/linux/build-appimage.sh

@@ -53,7 +53,7 @@ rm -rf usr/include
 rm -rf usr/mkspecs
 rm -rf usr/lib/x86_64-linux-gnu/
 
-# Don't bundle the explorer extentions as we can't do anything with them in the AppImage
+# Don't bundle the explorer extensions as we can't do anything with them in the AppImage
 rm -rf usr/share/caja-python/
 rm -rf usr/share/nautilus-python/
 rm -rf usr/share/nemo-python/

admin/linux/debian/scripts/git2changelog.cfg

@@ -1,7 +1,7 @@
 # Use the configuration below with appropriate changes,
 # if you want to support a new client version using
 # your own fork. In such a case the tags do not come
-# accross to the main repo for a pull request, so
+# across to the main repo for a pull request, so
 # some hacking is needed
 [versionhack]
 commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0

admin/osx/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined.
+# Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
 

cmake/modules/CheckPrototypeDefinition.cmake

@@ -1,4 +1,4 @@
-# - Check if the protoype we expect is correct.
+# - Check if the prototype we expect is correct.
 # check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
 #  FUNCTION - The name of the function (used to check if prototype exists)
 #  PROTOTYPE- The prototype to check.

cmake/modules/ECMFindModuleHelpers.cmake

@@ -68,7 +68,7 @@
 # If SKIP_DEPENDENCY_HANDLING is not set, the INTERFACE_LINK_LIBRARIES property
 # of the imported target for <component> will be set to contain the imported
 # targets for the components listed in <name>_<component>_component_deps.
-# <component>_FOUND will also be set to false if any of the compoments in
+# <component>_FOUND will also be set to false if any of the components in
 # <name>_<component>_component_deps are not found.  This requires the components
 # in <name>_<component>_component_deps to be listed before <component> in the
 # COMPONENTS argument.

cmake/modules/MacroLogFeature.cmake

@@ -7,7 +7,7 @@
 #   FEATURE: name of the feature, e.g. "libjpeg"
 #   DESCRIPTION: description what this feature provides
 #   URL: home page
-#   REQUIRED: TRUE or FALSE, indicating whether the featue is required
+#   REQUIRED: TRUE or FALSE, indicating whether the feature is required
 #   MIN_VERSION: minimum version number. empty string if unneeded
 #   COMMENTS: More info you may want to provide.  empty string if unnecessary
 #

cmake/scripts/generate_lib_file

@@ -29,7 +29,7 @@ project=gets.chomp
 
 printf("\n")
 
-print("Other projects to include (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
+print("Other projects to include (e.g. \"owutil tinyxml\", leave empty to skip): ")
 otherprojects=gets.chomp
 
 printf("\n")

doc/_shared_assets/themes/bootstrap/layout.html

@@ -2,7 +2,7 @@
 {% set script_files = script_files + ['_static/bootstrap.js'] %}
 {% set css_files = ['_static/bootstrap.css', '_static/bootstrap-sphinx.css'] + css_files %}
 
-{# Sidebar: Rework into our Boostrap nav section. #}
+{# Sidebar: Rework into our Bootstrap nav section. #}
 {% macro navBar() %}
   <div id="navbar" class="navbar navbar-fixed-top">
     <div class="navbar-inner">

doc/_shared_assets/themes/nextcloud_com/static/bootstrap-sphinx.css_t

@@ -193,7 +193,7 @@ table.field-list {
 .bs-sidenav ul{
   list-style-type: none;
   padding-left: 25px;
-  margin-left: 0;  /* bootstrap 2 compatability. */
+  margin-left: 0;  /* bootstrap 2 compatibility. */
 }
 
 @media (min-width: 1200px) {

doc/_shared_assets/themes/nextcloud_com/theme.conf

@@ -12,7 +12,7 @@ pygments_style = tango
 # Tab name for entire site. (Default: "Site")
 navbar_site_name = Sitex
 
-# A list of tuples containting pages to link to.  The value should be
+# A list of tuples containing pages to link to.  The value should be
 # in the form [(name, page), ..]
 navbar_links =
 

doc/_shared_assets/themes/nextcloud_release/static/bootstrap-sphinx.css_t

@@ -193,7 +193,7 @@ table.field-list {
 .bs-sidenav ul{
   list-style-type: none;
   padding-left: 25px;
-  margin-left: 0;  /* bootstrap 2 compatability. */
+  margin-left: 0;  /* bootstrap 2 compatibility. */
 }
 
 @media (min-width: 1200px) {

doc/_shared_assets/themes/nextcloud_release/theme.conf

@@ -12,7 +12,7 @@ pygments_style = tango
 # Tab name for entire site. (Default: "Site")
 navbar_site_name = Sitex
 
-# A list of tuples containting pages to link to.  The value should be
+# A list of tuples containing pages to link to.  The value should be
 # in the form [(name, page), ..]
 navbar_links =
 

doc/building.rst

@@ -110,7 +110,7 @@ Then, in Terminal:
 
       % /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
-.. note:: Under certain cirumstances, you may get on error along the
+.. note:: Under certain circumstances, you may get on error along the
    lines of ``Permission denied @ apply2files`` when installing certain
    Homebrew packages. This is `a known issue`_ and can be fixed by changing
    the permissions on the affected files with the following command:

doc/conf.py

@@ -273,7 +273,7 @@
 # The format is a list of tuples containing the path and title.
 #epub_pre_files = []
 
-# HTML files shat should be inserted after the pages created by sphinx.
+# HTML files that should be inserted after the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
 #epub_post_files = []
 

doc/conffile.rst

@@ -57,7 +57,7 @@ Some interesting values that can be set on the configuration file are:
 |                                  |                          | This option only works on linux                                                                        |
 +----------------------------------+--------------------------+--------------------------------------------------------------------------------------------------------+
 | ``showExperimentalOptions``      | ``false``                | Whether to show experimental options that are still undergoing testing in the user interface.          |
-|                                  |                          | Turning this on does not enable experimental behavior on its own. It does enable user inferface        |
+|                                  |                          | Turning this on does not enable experimental behavior on its own. It does enable user interface        |
 |                                  |                          | options that can be used to opt in to experimental features.                                           |
 +----------------------------------+--------------------------+--------------------------------------------------------------------------------------------------------+
 | ``showMainDialogAsNormalWindow`` | ``false``                | Whether the main dialog should be shown as a normal window even if tray icons are available.           |

doc/conflicts.rst

@@ -11,7 +11,7 @@ The Nextcloud desktop client uploads local changes and downloads remote changes.
 When a file has changed on the local side and on the remote between synchronization
 runs the client will be unable to resolve the situation on its own. It will
 create a conflict file with the local version, download the remote version and
-notify the user that a conflict occured which needs attention.
+notify the user that a conflict occurred which needs attention.
 
 Example
 -------

doc/dev/Doxyfile.in

@@ -1067,7 +1067,7 @@ HTML_STYLESHEET        =
 # defined cascading style sheet that is included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
+# standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet file to the output directory. For an example
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1951,7 +1951,7 @@ PREDEFINED             = OWNCLOUDSYNC_EXPORT
 EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
+# remove all references to function-like macros that are alone on a line, have an
 # all uppercase name, and do not end with a semicolon. Such function macros are
 # typically used for boiler-plate code, and will confuse the parser if not
 # removed.

doc/introduction.rst

@@ -19,7 +19,7 @@ The |version| release of the Nextcloud desktop sync client has many new features
 improvements.
 
   * Main dialog will be a regular window if tray icons are not available on the system.
-  * Virtual files wil be optional. That enables the desktop client to run on older Windows versions.
+  * Virtual files will be optional. That enables the desktop client to run on older Windows versions.
   * Improvements for the virtual files on Windows
   * Network traffic performance improvements
   * Improvements to the sync engine

doc/navigating.rst

@@ -227,7 +227,7 @@ folders larger than [folder size]**.
 Using the Network Window
 ------------------------
 
-.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
+.. index:: proxy settings, SOCKS, bandwidth, throttling, limiting
 
 The Network settings window enables you to define network proxy settings, and
 also to limit download and upload bandwidth.

doc/visualtour.rst

@@ -124,7 +124,7 @@ The tab provides several useful options:
 Network
 ~~~~~~~
 
-.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
+.. index:: proxy settings, SOCKS, bandwidth, throttling, limiting
 
 This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``:
 

shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/LineProcessor.m

@@ -94,8 +94,8 @@ -(void)process:(NSString*)line
             [self.delegate addMenuItem:item];
         });
     } else {
-        // LOG UNKOWN COMMAND
-        NSLog(@"Unkown command: %@", command);
+        // LOG UNKNOWN COMMAND
+        NSLog(@"Unknown command: %@", command);
     }
 }
 

shell_integration/nautilus/createcajaplugin.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # this script creates a plugin for caja, just by replacing
-# all occurences of Nautilus with Caja (case sensitive).
+# all occurrences of Nautilus with Caja (case sensitive).
 
 cp syncstate.py syncstate_caja.py
 sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py

shell_integration/nautilus/createnemoplugin.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # this script creates a plugin for nemo, just be replacing
-# all occurences of Nautilus with Nemo.
+# all occurrences of Nautilus with Nemo.
 
 cp syncstate.py syncstate_nemo.py
 sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py

shell_integration/nautilus/setappname.sh

@@ -3,6 +3,6 @@
 # this script replaces the line
 #  appname = 'Nextcloud'
 # with the correct branding name in the syncstate.py script
-# It also replaces the occurences in the class name so several
+# It also replaces the occurrences in the class name so several
 # branding can be loaded (see #6524)
 sed -i.org -e "s/Nextcloud/$1/g" syncstate.py

shell_integration/nautilus/syncstate.py

@@ -105,7 +105,7 @@ def _connectToSocketServer(self):
                 return False  # Don't run again
             except Exception as e:
                 print("Could not connect to unix socket " + sock_file + ". " + str(e))
-        except Exception as e:  # Bad habbit
+        except Exception as e:  # Bad habit
             print("Connect could not be established, try again later.")
             self._sock.close()
 

shell_integration/windows/NCOverlays/NCOverlay.cpp

@@ -98,8 +98,8 @@ IFACEMETHODIMP_(ULONG) NCOverlay::Release()
 
 IFACEMETHODIMP NCOverlay::GetPriority(int *pPriority)
 {
-    // this defines which handler has prededence, so
-    // we order this in terms of likelyhood
+    // this defines which handler has precedence, so
+    // we order this in terms of likelihood
     switch (_state) {
     case State_OK:
         *pPriority = 0; break;

shell_integration/windows/WinShellExt.wxs.in

@@ -37,7 +37,7 @@
         <?define OverlayGuidWarning     = "@WIN_SHELLEXT_OVERLAY_GUID_WARNING@" ?>
 
         <!--
-            Preceeding spaces are intended, two spaces to put us ahead of the competition :/
+            Preceding spaces are intended, two spaces to put us ahead of the competition :/
 
             There is a limit in Windows (oh wonder^^) so that only the first 15 extensions get invoked, this is why to use that dirty little trick to get ahead ;)
             See: https://docs.microsoft.com/en-us/windows/win32/shell/context-menu-handlers?redirectedfrom=MSDN#employing-the-verb-selection-model

shell_integration/windows/WinShellExtConstants.h.in

@@ -30,7 +30,7 @@
 #define OVERLAY_GUID_WARNING        L"@WIN_SHELLEXT_OVERLAY_GUID_WARNING@"
 
 //
-// Preceeding spaces are intended, two spaces to put us ahead of the competition :/
+// Preceding spaces are intended, two spaces to put us ahead of the competition :/
 //
 // There is a limit in Windows (oh wonder^^) so that only the first 15 extensions get invoked, this is why to use that dirty little trick to get ahead ;)
 // See: https://docs.microsoft.com/en-us/windows/win32/shell/context-menu-handlers?redirectedfrom=MSDN#employing-the-verb-selection-model

src/common/filesystembase.cpp

@@ -172,7 +172,7 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
 #ifndef Q_OS_WIN
     bool success = false;
     QFile orig(originFileName);
-    // We want a rename that also overwites.  QFile::rename does not overwite.
+    // We want a rename that also overwrites.  QFile::rename does not overwrite.
     // Qt 5.1 has QSaveFile::renameOverwrite we could use.
     // ### FIXME
     success = true;

src/common/syncjournaldb.h

@@ -219,11 +219,11 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
      * This usually creates some temporary files next to the db file, like
      * $dbfile-shm or $dbfile-wal.
      *
-     * returns true if it could be openend or is currently opened.
+     * returns true if it could be opened or is currently opened.
      */
     bool open();
 
-    /** Returns whether the db is currently openend. */
+    /** Returns whether the db is currently opened. */
     bool isOpen();
 
     /** Close the database */

src/common/syncjournalfilerecord.h

@@ -125,7 +125,7 @@ class OCSYNC_EXPORT SyncJournalErrorBlacklistRecord
     QString _file;
     QString _renameTarget;
 
-    /// The last X-Request-ID of the request that failled
+    /// The last X-Request-ID of the request that failed
     QByteArray _requestId;
 
     [[nodiscard]] bool isValid() const;

src/common/utility.cpp

@@ -279,7 +279,7 @@ void Utility::usleep(int usec)
     QThread::usleep(usec);
 }
 
-// This can be overriden from the tests
+// This can be overridden from the tests
 OCSYNC_EXPORT bool fsCasePreserving_override = []() -> bool {
     QByteArray env = qgetenv("OWNCLOUD_TEST_CASE_PRESERVING");
     if (!env.isEmpty())
@@ -298,7 +298,7 @@ bool Utility::fileNamesEqual(const QString &fn1, const QString &fn2)
     const QDir fd2(fn2);
 
     // Attention: If the path does not exist, canonicalPath returns ""
-    // ONLY use this function with existing pathes.
+    // ONLY use this function with existing paths.
     const QString a = fd1.canonicalPath();
     const QString b = fd2.canonicalPath();
     bool re = !a.isEmpty() && QString::compare(a, b, fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive) == 0;
@@ -673,7 +673,7 @@ bool Utility::isPathWindowsDrivePartitionRoot(const QString &path)
         return false;
     }
 
-    // must mutch a pattern "[A-Za-z]:"
+    // must match a pattern "[A-Za-z]:"
     if (!(path.at(1) == QLatin1Char(':') && path.at(0).isLetter())) {
         return false;
     }

src/common/utility.h

@@ -145,7 +145,7 @@ namespace Utility {
     // if false, the two cases are two different files.
     OCSYNC_EXPORT bool fsCasePreserving();
 
-    // Check if two pathes that MUST exist are equal. This function
+    // Check if two paths that MUST exist are equal. This function
     // uses QDir::canonicalPath() to judge and cares for the systems
     // case sensitivity.
     OCSYNC_EXPORT bool fileNamesEqual(const QString &fn1, const QString &fn2);
@@ -167,7 +167,7 @@ namespace Utility {
      * Use this to get a string that describes the timespan between the first and
      * the second timestamp in a human readable and understandable form.
      *
-     * If the second parameter is ommitted, the current time is used.
+     * If the second parameter is omitted, the current time is used.
      */
     OCSYNC_EXPORT QString timeAgoInWords(const QDateTime &dt, const QDateTime &from = QDateTime());
 
@@ -276,7 +276,7 @@ namespace Utility {
     {
     public:
         /**
-         * NTFS permissions lookup is diabled by default for performance reasons
+         * NTFS permissions lookup is disabled by default for performance reasons
          * Enable it and disable it again once we leave the scope
          * https://doc.qt.io/Qt-5/qfileinfo.html#ntfs-permissions
          */

src/gui/accountsettings.cpp

@@ -527,7 +527,7 @@ void AccountSettings::slotSubfolderContextMenuRequested(const QModelIndex& index
             ac = menu.addAction(tr("Encrypt"));
             connect(ac, &QAction::triggered, [this, info] { slotMarkSubfolderEncrypted(info); });
         } else {
-            // Ingore decrypting for now since it only works with an empty folder
+            // Ignore decrypting for now since it only works with an empty folder
             // connect(ac, &QAction::triggered, [this, &info] { slotMarkSubfolderDecrypted(info); });
         }
     }

src/gui/accountstate.h

@@ -159,12 +159,12 @@ class AccountState : public QObject, public QSharedData
     ///Asks for user credentials
     void handleInvalidCredentials();
 
-    /** Returns the notifications status retrieved by the notificatons endpoint
+    /** Returns the notifications status retrieved by the notifications endpoint
      *  https://github.com/nextcloud/desktop/issues/2318#issuecomment-680698429
     */
     bool isDesktopNotificationsAllowed() const;
 
-    /** Set desktop notifications status retrieved by the notificatons endpoint
+    /** Set desktop notifications status retrieved by the notifications endpoint
     */
     void setDesktopNotificationsAllowed(bool isAllowed);
 

src/gui/application.cpp

@@ -722,7 +722,7 @@ void Application::parseOptions(const QStringList &options)
             // virtual file, open it after the Folder were created (if the app is not terminated)
             QTimer::singleShot(0, this, [this, option] { openVirtualFile(option); });
         } else if (option.startsWith(QStringLiteral(APPLICATION_URI_HANDLER_SCHEME "://open"))) {
-            // see the section Local file editing of the Architecture page of the user documenation
+            // see the section Local file editing of the Architecture page of the user documentation
             _editFileLocallyUrl = QUrl::fromUserInput(option);
             if (!_editFileLocallyUrl.isValid()) {
                 _editFileLocallyUrl.clear();

src/gui/connectionvalidator.h

@@ -31,7 +31,7 @@ namespace OCC {
  * checkAuthentication is the quick version that only does the propfind
  * while checkServerAndAuth is doing the 4 calls.
  *
- * We cannot use the capabilites call to test the login and the password because of
+ * We cannot use the capabilities call to test the login and the password because of
  * https://github.com/owncloud/core/issues/12930
  *
  * Here follows the state machine