[Pkg-owncloud-commits] [owncloud-client] 68/218: Consistency: Use folder instead of directory in user visible strings
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 17 14:30:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 66f340734cff57bd13c993f33e8e75fee73b00b1
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Mon Sep 7 08:51:22 2015 +0200
Consistency: Use folder instead of directory in user visible strings
---
src/gui/application.cpp | 4 ++--
src/gui/folder.cpp | 2 +-
src/gui/folderman.cpp | 2 +-
src/gui/folderwizard.cpp | 2 +-
src/gui/ignorelisteditor.cpp | 2 +-
src/gui/wizard/owncloudadvancedsetuppage.cpp | 4 ++--
src/gui/wizard/owncloudadvancedsetuppage.ui | 2 +-
src/libsync/discoveryphase.cpp | 2 +-
src/libsync/owncloudpropagator.cpp | 2 +-
src/libsync/propagatorjobs.cpp | 8 ++++----
src/libsync/syncengine.cpp | 20 ++++++++++----------
src/libsync/utility_unix.cpp | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 36b4c00..2bcafee 100644
--- 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 69f76de..f8fe7b0 100644
--- 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 b5edbe6..f47ed0c 100644
--- 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 998632a..68b6b70 100644
--- 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 d18c40f..508062b 100644
--- 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 a933761..3538fb7 100644
--- 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 15e477a..660e43a 100644
--- 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><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></string>
+ <string><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></string>
</property>
<property name="text">
<string>Start a &clean sync (Erases the local folder!)</string>
diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 07b0179..dd7b45c 100644
--- 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 506e617..c89cdb5 100644
--- 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 7c4df9c..47c1645 100644
--- 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 2c8b15d..62f6c10 100644
--- 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 3c108f2..ed71c08 100644
--- 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);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list