Fix typos.

Debian has a list of known typos in their checking tools.

Signed-off-by: Sandro Knauß <hefee@debian.org>

diff --git a/cmake/modules/DefineCMakeDefaults.cmake b/cmake/modules/DefineCMakeDefaults.cmake
index 483722fdcb0a70187c60ae2479aaee15dafac257..bed21525d8b8d85d7e5ad02798d3ee330ed5d47f 100644 (file)
--- a/cmake/modules/DefineCMakeDefaults.cmake
+++ b/cmake/modules/DefineCMakeDefaults.cmake
@@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Put the include dirs which are in the source or build tree
 # before all other include dirs, so the headers in the sources
-# are prefered over the already installed ones
+# are preferred over the already installed ones
 # since cmake 2.4.1
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 

diff --git a/src/3rdparty/sqlite3/sqlite3.c b/src/3rdparty/sqlite3/sqlite3.c
index ce4f343fdcc2f2eac809ee0a8a3f1cf58272d1d1..9d7fd78375d5fa24e94bd766246729ffe12fc515 100644 (file)
--- a/src/3rdparty/sqlite3/sqlite3.c
+++ b/src/3rdparty/sqlite3/sqlite3.c
@@ -70201,7 +70201,7 @@ static int btreeOverwriteContent(
 ){
   int nData = pX->nData - iOffset;
   if( nData<=0 ){
-    /* Overwritting with zeros */
+    /* Overwriting with zeros */
     int i;
     for(i=0; i<iAmt && pDest[i]==0; i++){}
     if( i<iAmt ){
@@ -91521,7 +91521,7 @@ static int vdbeSorterFlushPMA(VdbeSorter *pSorter){
   ** the background thread from a sub-tasks previous turn is still running,
   ** skip it. If the first (pSorter->nTask-1) sub-tasks are all still busy,
   ** fall back to using the final sub-task. The first (pSorter->nTask-1)
-  ** sub-tasks are prefered as they use background threads - the final 
+  ** sub-tasks are preferred as they use background threads - the final
   ** sub-task uses the main thread. */
   for(i=0; i<nWorker; i++){
     int iTest = (pSorter->iPrev + i + 1) % nWorker;

diff --git a/src/gui/clientproxy.cpp b/src/gui/clientproxy.cpp
index 52b4554470dd52180f4d69bb4bcacab85f5c81f5..657a93538a420871083f2972c70d1d3945b469be 100644 (file)
--- a/src/gui/clientproxy.cpp
+++ b/src/gui/clientproxy.cpp
@@ -80,7 +80,7 @@ void ClientProxy::setupQtProxyFromConfig()
             QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
             break;
         case QNetworkProxy::DefaultProxy:
-            qCInfo(lcClientProxy) << "Set proxy configuration to use the prefered system proxy for http tcp connections";
+            qCInfo(lcClientProxy) << "Set proxy configuration to use the preferred system proxy for http tcp connections";
             {
                 QNetworkProxyQuery query;
                 query.setProtocolTag("http");

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 59816dd127355e1805d513771257eb16bd0c36a1..be2de5c2ca1aa1bab4816f2da8704b76ddac2cca 100644 (file)
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -589,7 +589,7 @@ QByteArray encryptStringAsymmetric(EVP_PKEY *publicKey, const QByteArray& data)
         qCInfo(lcCse()) << "Error retrieving the size of the encrypted data";
         exit(1);
     } else {
-        qCInfo(lcCse()) << "Encrption Length:" << outLen;
+        qCInfo(lcCse()) << "Encryption Length:" << outLen;
     }
 
     unsigned char *out = (uchar*) OPENSSL_malloc(outLen);
@@ -623,7 +623,7 @@ void ClientSideEncryption::initialize()
 {
     qCInfo(lcCse()) << "Initializing";
     if (!_account->capabilities().clientSideEncryptionAvaliable()) {
-        qCInfo(lcCse()) << "No Client side encryption avaliable on server.";
+        qCInfo(lcCse()) << "No Client side encryption available on server.";
         emit initializationFinished();
         return;
     }
@@ -1376,7 +1376,7 @@ bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &i
       qCDebug(lcCse) << "Could not open input file for reading" << input->errorString();
     }
     if (!output->open(QIODevice::WriteOnly)) {
-      qCDebug(lcCse) << "Could not oppen output file for writting" << output->errorString();
+      qCDebug(lcCse) << "Could not oppen output file for writing" << output->errorString();
     }
 
     // Init

diff --git a/src/libsync/propagateuploadencrypted.cpp b/src/libsync/propagateuploadencrypted.cpp
index b9e659d87477032085f3963b1cc8f1c76f420191..e9786c3424700cab890d23999b67f2e56f92e5a8 100644 (file)
--- a/src/libsync/propagateuploadencrypted.cpp
+++ b/src/libsync/propagateuploadencrypted.cpp
@@ -242,7 +242,7 @@ void PropagateUploadEncrypted::slotFolderLockedError(const QByteArray& fileId, i
 
         // Perhaps I should remove the elapsed timer if the lock is from this client?
         if (_folderLockFirstTry.elapsed() > /* five minutes */ 1000 * 60 * 5 ) {
-            qCDebug(lcPropagateUploadEncrypted) << "One minute passed, ignoring more attemps to lock the folder.";
+            qCDebug(lcPropagateUploadEncrypted) << "One minute passed, ignoring more attempts to lock the folder.";
         return;
         }
         slotTryLock(fileId);