Consistency: Use folder instead of directory in user visible strings

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 36b4c0018bad7019db0e0910f37573b6996806f2..2bcafee6e3b215867fe0f639727e717a16ca85ce 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -62,11 +62,11 @@ static const char optionsC[] =
         "  --logwindow          : open a window to show log output.\n"
         "  --logfile <filename> : write log output to file <filename>.\n"
         "  --logdir <name>      : write each sync log output in a new file\n"
-        "                         in directory <name>.\n"
+        "                         in folder <name>.\n"
         "  --logexpire <hours>  : removes logs older than <hours> hours.\n"
         "                         (to be used with --logdir)\n"
         "  --logflush           : flush the log file after every write.\n"
-        "  --confdir <dirname>  : Use the given configuration directory.\n"
+        "  --confdir <dirname>  : Use the given configuration folder.\n"
         ;
 
 QString applicationTrPath()

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 69f76def3914b255cc55d4f2d86d72b9d332ceec..f8fe7b0b1bfcd9ac2ad2da6427f0df6ae6795fbc 100644 (file)
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -168,7 +168,7 @@ void Folder::checkLocalPath()
             _syncResult.setErrorString(tr("Local folder %1 does not exist.").arg(_definition.localPath));
             _syncResult.setStatus( SyncResult::SetupError );
         } else if( !fi.isDir() ) {
-            _syncResult.setErrorString(tr("%1 should be a directory but is not.").arg(_definition.localPath));
+            _syncResult.setErrorString(tr("%1 should be a folder but is not.").arg(_definition.localPath));
             _syncResult.setStatus( SyncResult::SetupError );
         } else if( !fi.isReadable() ) {
             _syncResult.setErrorString(tr("%1 is not readable.").arg(_definition.localPath));

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index b5edbe673e98678bbeeec33f1da7211bad43466f..f47ed0cc5b4b59aca875786fb3de0a09c3daede7 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1135,7 +1135,7 @@ QString FolderMan::checkPathValidityForNewFolder(const QString& path, bool forNe
     }
 
     if( !selFile.isDir() ) {
-        return tr("The selected path is not a directory!");
+        return tr("The selected path is not a folder!");
     }
 
     if ( !selFile.isWritable() ) {

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 998632acbde563e29a3e3b8098e95713572b177b..68b6b70abb1d89026294500b2e1cd98db31dc1a1 100644 (file)
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -78,7 +78,7 @@ FolderWizardLocalPath::FolderWizardLocalPath()
     }
     _ui.aliasLineEdit->setText( newAlias );
 
-    _ui.aliasLineEdit->setToolTip(tr("The directory alias is a descriptive name for this sync connection."));
+    _ui.aliasLineEdit->setToolTip(tr("The folder alias is a descriptive name for this sync connection."));
     _ui.warnLabel->setTextFormat(Qt::RichText);
     _ui.warnLabel->hide();
 }

diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
index d18c40f6a314f4b79ceb55154e949709ceecfe86..508062bdb23531a21a2c1f60b72f2f9892bbf28e 100644 (file)
--- a/src/gui/ignorelisteditor.cpp
+++ b/src/gui/ignorelisteditor.cpp
@@ -36,7 +36,7 @@ IgnoreListEditor::IgnoreListEditor(QWidget *parent) :
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     ui->setupUi(this);
 
-    ui->descriptionLabel->setText(tr("Files or directories matching a pattern will not be synchronized.\n\n"
+    ui->descriptionLabel->setText(tr("Files or folders matching a pattern will not be synchronized.\n\n"
                                      "Items where deletion is allowed will be deleted if they prevent a "
                                      "directory from being removed. "
                                      "This is useful for meta data."));

diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index a9337611124855ec06a8d0266a2636bb9e4a1bc0..3538fb71bdd9225afc2815165cbd37da46cf5cdb 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -139,12 +139,12 @@ void OwncloudAdvancedSetupPage::updateStatus()
             t = tr("%1 folder '%2' is synced to local folder '%3'")
                 .arg(Theme::instance()->appName()).arg(_remoteFolder)
                 .arg(QDir::toNativeSeparators(locFolder));
-              _ui.rSyncEverything->setText(tr("Sync the directory '%1'").arg(_remoteFolder));
+              _ui.rSyncEverything->setText(tr("Sync the folder '%1'").arg(_remoteFolder));
         }
 
         const bool dirNotEmpty(QDir(locFolder).entryList(QDir::AllEntries | QDir::NoDotAndDotDot).count() > 0);
         if(dirNotEmpty) {
-            t += tr("<p><small><strong>Warning:</strong> The local directory is not empty. "
+            t += tr("<p><small><strong>Warning:</strong> The local folder is not empty. "
                     "Pick a resolution!</small></p>");
         }
         _ui.resolutionWidget->setVisible(dirNotEmpty);

diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui
index 15e477a6649f6e34a5132d4abcb746a55fc7b8e2..660e43a5a4d3bfe2aa91e00bfa329d5b52199301 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -197,7 +197,7 @@
         <item row="2" column="0" colspan="2">
          <widget class="QRadioButton" name="cbSyncFromScratch">
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.&lt;/p&gt;&lt;p&gt;Do not check this if the local content should be uploaded to the servers directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.&lt;/p&gt;&lt;p&gt;Do not check this if the local content should be uploaded to the servers folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
            <string>Start a &amp;clean sync (Erases the local folder!)</string>

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 07b01799de9ddb9252117135e0077d2c8012cb91..dd7b45c6472cc648e76a93c82b7015aeeab87f22 100644 (file)
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -80,7 +80,7 @@ bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path)
         return false;
     }
 
-    // Go in the main thread to do a PROPFIND to know the size of this directory
+    // Go in the main thread to do a PROPFIND to know the size of this folder
     qint64 result = -1;
 
     {

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 506e617787f4ed198a8397e5422977c8e25cdfe7..c89cdb5c505fbb5544b87176b870227ad6dd1ad8 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -208,7 +208,7 @@ void PropagateItemJob::slotRestoreJobCompleted(const SyncFileItem& item )
             || item._status == SyncFileItem::Restoration) {
         done( SyncFileItem::SoftError, msg);
     } else {
-        done( item._status, tr("A file or directory was removed from a read only share, but restoring failed: %1").arg(item._errorString) );
+        done( item._status, tr("A file or folder was removed from a read only share, but restoring failed: %1").arg(item._errorString) );
     }
 }
 

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index 7c4df9cb8be2ab86914825257f7dbf67648edcc9..47c16451d5d4feae31b0db6f461ca808775cac78 100644 (file)
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -95,9 +95,9 @@ bool PropagateLocalRemove::removeRecursively(const QString& path)
     if (success) {
         success = QDir().rmdir(absolute);
         if (!success) {
-            _error += PropagateLocalRemove::tr("Could not remove directory '%1';")
+            _error += PropagateLocalRemove::tr("Could not remove folder '%1';")
                 .arg(QDir::toNativeSeparators(absolute)) + " ";
-            qDebug() << "Error removing directory" << absolute;
+            qDebug() << "Error removing folder" << absolute;
         }
     }
     return success;
@@ -141,14 +141,14 @@ void PropagateLocalMkdir::start()
     QDir newDir(_propagator->_localDir + _item->_file);
     QString newDirStr = QDir::toNativeSeparators(newDir.path());
     if( Utility::fsCasePreserving() && _propagator->localFileNameClash(_item->_file ) ) {
-        qDebug() << "WARN: new directory to create locally already exists!";
+        qDebug() << "WARN: new folder to create locally already exists!";
         done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
         return;
     }
     _propagator->addTouchedFile(newDirStr);
     QDir localDir(_propagator->_localDir);
     if (!localDir.mkpath(_item->_file)) {
-        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirStr) );
+        done( SyncFileItem::NormalError, tr("could not create folder %1").arg(newDirStr) );
         return;
     }
 

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 2c8b15dc1b07d3f457aaa30cb1586b6f9776177c..62f6c108eabb45d1afc91cb8f7d409b832681647 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -98,7 +98,7 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
         break;
     case CSYNC_STATUS_STATEDB_LOAD_ERROR:
         errStr = tr("CSync failed to load or create the journal file. "
-                    "Make sure you have read and write permissions in the local sync directory.");
+                    "Make sure you have read and write permissions in the local sync folder.");
         break;
     case CSYNC_STATUS_STATEDB_CORRUPTED:
         errStr = tr("CSync failed to load the journal file. The journal file is corrupted.");
@@ -146,7 +146,7 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
         errStr = tr("CSync failed to access") + " "; // filename gets added.
         break;
     case CSYNC_STATUS_FILE_EXISTS:
-        errStr = tr("CSync tried to create a directory that already exists.");
+        errStr = tr("CSync tried to create a folder that already exists.");
         break;
     case CSYNC_STATUS_OUT_OF_SPACE:
         errStr = tr("CSync: No space on %1 server available.").arg(qApp->applicationName());
@@ -161,13 +161,13 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
         errStr = tr("The service is temporarily unavailable");
         break;
     case CSYNC_STATUS_STORAGE_UNAVAILABLE:
-        errStr = tr("The mounted directory is temporarily not available on the server");
+        errStr = tr("The mounted folder is temporarily not available on the server");
         break;
     case CSYNC_STATUS_OPENDIR_ERROR:
-        errStr = tr("An error occurred while opening a directory");
+        errStr = tr("An error occurred while opening a folder");
         break;
     case CSYNC_STATUS_READDIR_ERROR:
-        errStr = tr("Error while reading directory.");
+        errStr = tr("Error while reading folder.");
         break;
     case CSYNC_STATUS_INVALID_CHARACTERS:
         // Handled in callee
@@ -594,7 +594,7 @@ void SyncEngine::startSync()
 
     if (!QDir(_localPath).exists()) {
         // No _tr, it should only occur in non-mirall
-        emit csyncError("Unable to find local sync directory.");
+        emit csyncError("Unable to find local sync folder.");
         finalize();
         return;
     }
@@ -981,20 +981,20 @@ void SyncEngine::checkForPermission()
                     qDebug() << "checkForPermission: ERROR" << (*it)->_file;
                     (*it)->_instruction = CSYNC_INSTRUCTION_ERROR;
                     (*it)->_status = SyncFileItem::NormalError;
-                    (*it)->_errorString = tr("Not allowed because you don't have permission to add sub-directories in that directory");
+                    (*it)->_errorString = tr("Not allowed because you don't have permission to add subfolders that folder");
 
                     for (SyncFileItemVector::iterator it_next = it + 1; it_next != _syncedItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
                         it = it_next;
                         (*it)->_instruction = CSYNC_INSTRUCTION_ERROR;
                         (*it)->_status = SyncFileItem::NormalError;
-                        (*it)->_errorString = tr("Not allowed because you don't have permission to add parent directory");
+                        (*it)->_errorString = tr("Not allowed because you don't have permission to add parent folder");
                     }
 
                 } else if (!(*it)->_isDirectory && !perms.contains("C")) {
                     qDebug() << "checkForPermission: ERROR" << (*it)->_file;
                     (*it)->_instruction = CSYNC_INSTRUCTION_ERROR;
                     (*it)->_status = SyncFileItem::NormalError;
-                    (*it)->_errorString = tr("Not allowed because you don't have permission to add files in that directory");
+                    (*it)->_errorString = tr("Not allowed because you don't have permission to add files in that folder");
                 }
                 break;
             }
@@ -1040,7 +1040,7 @@ void SyncEngine::checkForPermission()
                             it = it_next;
 
                             if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE) {
-                                qWarning() << "non-removed job within a removed directory"
+                                qWarning() << "non-removed job within a removed folder"
                                            << (*it)->_file << (*it)->_instruction;
                                 continue;
                             }

diff --git a/src/libsync/utility_unix.cpp b/src/libsync/utility_unix.cpp
index 3c108f28eb41643e729a93b6a5abdbee040abbac..ed71c088dd3e35b98a4754eb92477f2b001c157d 100644 (file)
--- a/src/libsync/utility_unix.cpp
+++ b/src/libsync/utility_unix.cpp
@@ -59,7 +59,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString& guiName,
     QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
     if (enable) {
         if (!QDir().exists(userAutoStartPath) && !QDir().mkpath(userAutoStartPath)) {
-            qDebug() << "Could not create autostart directory";
+            qDebug() << "Could not create autostart folder";
             return;
         }
         QFile iniFile(desktopFileLocation);