diff --git a/doc/visualtour.rst b/doc/visualtour.rst index 5a3bb3e0e..3f2ad4578 100644 --- a/doc/visualtour.rst +++ b/doc/visualtour.rst @@ -126,7 +126,7 @@ Network .. index:: proxy settings, SOCKS, bandwidth, throttling, limiting -This tab consolidates ``Proxy Settings`` and ``Bandwith Limiting``: +This tab consolidates ``Proxy Settings`` and ``Bandwidth Limiting``: .. image:: images/settings_network.png :scale: 50 % diff --git a/shell_integration/MacOSX/NextcloudIntegration/NCDesktopClientSocketKit/LocalSocketClient.m b/shell_integration/MacOSX/NextcloudIntegration/NCDesktopClientSocketKit/LocalSocketClient.m index c245ecf31..5d76888f2 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NCDesktopClientSocketKit/LocalSocketClient.m +++ b/shell_integration/MacOSX/NextcloudIntegration/NCDesktopClientSocketKit/LocalSocketClient.m @@ -343,7 +343,7 @@ // Add NULL terminator, so we can use C string methods if (firstSeparatorIndex.location == NSNotFound) { - NSLog(@"No separator found. Creating new buffer qith space for null terminator."); + NSLog(@"No separator found. Creating new buffer with space for null terminator."); [_inBuffer appendBytes:terminator length:1]; nullTerminatorIndex = inBufferLength; diff --git a/src/common/pinstate.h b/src/common/pinstate.h index d2bc9f11b..4359e720e 100644 --- a/src/common/pinstate.h +++ b/src/common/pinstate.h @@ -78,7 +78,7 @@ enum class PinState { /** The file will never be synced to the cloud. * - * Usefull for ignored files to indicate to the OS the file will never be + * Useful for ignored files to indicate to the OS the file will never be * synced */ Excluded = 4, diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp index 3133e22cd..a8ae2d167 100644 --- a/src/gui/accountstate.cpp +++ b/src/gui/accountstate.cpp @@ -567,10 +567,10 @@ void AccountState::slotCheckServerAvailibility() || state() == AccountState::SignedOut || state() == AccountState::MaintenanceMode || state() == AccountState::AskingCredentials) { - qCInfo(lcAccountState) << "Skipping server availibility check for account" << _account->davUser() << "with state" << state(); + qCInfo(lcAccountState) << "Skipping server availability check for account" << _account->davUser() << "with state" << state(); return; } - qCInfo(lcAccountState) << "Checking server availibility for account" << _account->davUser(); + qCInfo(lcAccountState) << "Checking server availability for account" << _account->davUser(); const auto serverAvailibilityUrl = Utility::concatUrlPath(_account->url(), QLatin1String("/index.php/204")); auto checkServerAvailibilityJob = _account->sendRequest(QByteArrayLiteral("GET"), serverAvailibilityUrl); connect(checkServerAvailibilityJob, &SimpleNetworkJob::finishedSignal, this, [this](QNetworkReply *reply) { diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index fee5eaef6..1a0ce1a08 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -568,7 +568,7 @@ void FolderMan::setupFolderFromOldConfigFile(const QString &fileNamePath, Accoun auto legacyBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok); if (!ok) { - qCInfo(lcFolderMan) << "There was a problem retriving the database selective sync for " << folder; + qCInfo(lcFolderMan) << "There was a problem retrieving the database selective sync for " << folder; } legacyBlacklist << settings.value(QLatin1String("blackList")).toStringList(); diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 061efc862..5bc886809 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -878,7 +878,7 @@ QStringList FolderStatusModel::createBlackList(const FolderStatusModel::SubFolde result += createBlackList(root._subs.at(i), oldBlackList); } } else { - // We did not load from the server so we re-use the one from the old black list + // We did not load from the server so we reuse the one from the old black list const QString path = root._path; foreach (const QString &it, oldBlackList) { if (it.startsWith(path)) diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h index 1d7ab93cd..c172dc2d9 100644 --- a/src/gui/folderwatcher.h +++ b/src/gui/folderwatcher.h @@ -150,7 +150,7 @@ private: QString findMatchingUnlockedFileInDir(const QString &dirPath, const QString &lockFileName); - /* Check if the path should be igored by the FolderWatcher. */ + /* Check if the path should be ignored by the FolderWatcher. */ [[nodiscard]] bool pathIsIgnored(const QString &path) const; /** Path of the expected test notification */ diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index d83d1b9cd..1250a595e 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -425,7 +425,7 @@ QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem *root) const result += createBlackList(root->child(i)); } } else { - // We did not load from the server so we re-use the one from the old black list + // We did not load from the server so we reuse the one from the old black list QString path = root->data(0, Qt::UserRole).toString(); foreach (const QString &it, _oldBlackList) { if (it.startsWith(path)) diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index e402764f0..9e9101b01 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -464,7 +464,7 @@ QSslConfiguration Account::getOrCreateSslConfig() // "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure" QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration(); - // Try hard to re-use session for different requests + // Try hard to reuse session for different requests sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false); sslConfig.setSslOption(QSsl::SslOptionDisableSessionSharing, false); sslConfig.setSslOption(QSsl::SslOptionDisableSessionPersistence, false); diff --git a/src/libsync/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h index a2dbb5c1f..2e4536992 100644 --- a/src/libsync/creds/httpcredentials.h +++ b/src/libsync/creds/httpcredentials.h @@ -97,7 +97,7 @@ public: QString fetchUser(); virtual bool sslIsTrusted() { return false; } - /* If we still have a valid refresh token, try to refresh it assynchronously and emit fetched() + /* If we still have a valid refresh token, try to refresh it asynchronously and emit fetched() * otherwise return false */ bool refreshAccessToken(); diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index e837641a4..342ccdd1b 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -457,7 +457,7 @@ public: /** The list of currently active jobs. This list contains the jobs that are currently using resources and is used purely to know how many jobs there is currently running for the scheduler. - Jobs add themself to the list when they do an assynchronous operation. + Jobs add themself to the list when they do an asynchronous operation. Jobs can be several time on the list (example, when several chunks are uploaded in parallel) */ QList _activeJobList; diff --git a/test/csync/std_tests/check_std_c_jhash.c b/test/csync/std_tests/check_std_c_jhash.c index 38b31c496..b11fe6ee9 100644 --- a/test/csync/std_tests/check_std_c_jhash.c +++ b/test/csync/std_tests/check_std_c_jhash.c @@ -34,7 +34,7 @@ static void check_c_jhash_trials(void **state) z=0; for (i=0; irowCount(), sourceModel->maxPossibleActivities()); auto errorSyncFileItemActivity = exampleSyncFileItemActivity(accountState->account()->displayName(), {}); - errorSyncFileItemActivity._message = QStringLiteral("Something went wrong and eveything exploded!"); + errorSyncFileItemActivity._message = QStringLiteral("Something went wrong and everything exploded!"); errorSyncFileItemActivity._syncFileItemStatus = OCC::SyncFileItem::FatalError; addActivity(model, &TestingALM::addSyncFileItemToActivityList, errorSyncFileItemActivity); diff --git a/test/testsynccfapi.cpp b/test/testsynccfapi.cpp index 0397bc0fc..b67e19422 100644 --- a/test/testsynccfapi.cpp +++ b/test/testsynccfapi.cpp @@ -1361,7 +1361,7 @@ private slots: FakeFolder fakeFolder{FileInfo{}}; auto vfs = setupVfs(fakeFolder); - // Create a Windows shotcut (.lnk) file + // Create a Windows shortcut (.lnk) file fakeFolder.remoteModifier().insert("linkfile.lnk"); QVERIFY(fakeFolder.syncOnce()); diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index c7408f9f9..10fcea8e6 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -1671,7 +1671,7 @@ private slots: fakeFolder.remoteModifier().insert(testUpperCaseFile); QVERIFY(fakeFolder.syncOnce()); - // we must get conflits + // we must get conflicts conflicts = findCaseClashConflicts(fakeFolder.currentLocalState()); QCOMPARE(conflicts.size(), shouldHaveCaseClashConflict ? 1 : 0); diff --git a/test/testunifiedsearchlistmodel.cpp b/test/testunifiedsearchlistmodel.cpp index 61885524a..9311673a6 100644 --- a/test/testunifiedsearchlistmodel.cpp +++ b/test/testunifiedsearchlistmodel.cpp @@ -52,7 +52,7 @@ public: QString _id; QString _name; qint32 _order = std::numeric_limits::max(); - quint32 _numItemsToInsert = 5; // how many fake resuls to insert + quint32 _numItemsToInsert = 5; // how many fake results to insert }; // this will be used when initializing fake search results data for each provider