[Pkg-owncloud-commits] [owncloud-client] 05/164: some typos, grammar and sentence fixes
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sun Mar 22 11:55:48 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 bd4f68233ff2964799ee73f9b82dcfc5e7b8cc19
Author: Volkan Gezer <volkangezer at gmail.com>
Date: Thu Feb 5 22:00:13 2015 +0100
some typos, grammar and sentence fixes
---
src/gui/folderwizard.cpp | 4 ++--
src/gui/logbrowser.cpp | 4 ++--
src/gui/owncloudsetupwizard.cpp | 2 +-
src/gui/sharedialog.cpp | 6 +++---
src/gui/sharedialog.ui | 4 ++--
src/libsync/owncloudpropagator.cpp | 4 ++--
src/libsync/propagateremotedelete.cpp | 2 +-
src/libsync/propagateremotemkdir.cpp | 2 +-
src/libsync/propagateremotemove.cpp | 2 +-
src/libsync/propagatorjobs.cpp | 8 ++++----
src/libsync/syncengine.cpp | 6 +++---
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index f35357b..4b2fb74 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -42,9 +42,9 @@ QString FormatWarningsWizardPage::formatWarnings(const QStringList &warnings) co
{
QString ret;
if (warnings.count() == 1) {
- ret = tr("<b>Warning:</b> ") + warnings.first();
+ ret = tr("<b>Warning:</b> %1").arg(warnings.first());
} else if (warnings.count() > 1) {
- ret = tr("<b>Warning:</b> ") + "<ul>";
+ ret = tr("<b>Warning:</b>") + " <ul>";
Q_FOREACH(QString warning, warnings) {
ret += QString::fromLatin1("<li>%1</li>").arg(warning);
}
diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp
index 4b4cb3a..3474370 100644
--- a/src/gui/logbrowser.cpp
+++ b/src/gui/logbrowser.cpp
@@ -68,7 +68,7 @@ LogBrowser::LogBrowser(QWidget *parent) :
mainLayout->addLayout( toolLayout );
// Search input field
- QLabel *lab = new QLabel(tr("&Search: "));
+ QLabel *lab = new QLabel(tr("&Search:") + " ");
_findTermEdit = new QLineEdit;
lab->setBuddy( _findTermEdit );
toolLayout->addWidget(lab);
@@ -191,7 +191,7 @@ void LogBrowser::slotSave()
stream << _logWidget->toPlainText();
file.close();
} else {
- QMessageBox::critical(this, tr("Error"), tr("Could not write to log file ")+ saveFile);
+ QMessageBox::critical(this, tr("Error"), tr("Could not write to log file %1").arg(saveFile));
}
}
_saveBtn->setEnabled(true);
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index e6d8c9e..f4709f3 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -274,7 +274,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString& localFo
// ownCloud is newly created.
_ocWizard->appendToConfigurationLog( tr("Local sync folder %1 already exists, setting it up for sync.<br/><br/>").arg(localFolder));
} else {
- QString res = tr("Creating local sync folder %1... ").arg(localFolder);
+ QString res = tr("Creating local sync folder %1...").arg(localFolder);
if( fi.mkpath( localFolder ) ) {
Utility::setupFavLink( localFolder );
// FIXME: Create a local sync folder.
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index a3b402f..16bba8f 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -433,7 +433,7 @@ bool ShareDialog::uploadExternalFile()
FolderMan::instance()->folder(folderName);
if( ! folder ) {
qDebug() << "Folder not defined: " << folderName;
- displayInfo(tr("Can not find a folder to upload to."));
+ displayInfo(tr("Cannot find an folder to upload to."));
return false;
}
@@ -456,7 +456,7 @@ bool ShareDialog::uploadExternalFile()
QFileInfo target(_expectedSyncFile);
if( target.exists() ) {
_ui->label_sharePath->setText(tr("A sync file with the same name exists. "
- "The file can not be registered to sync."));
+ "The file cannot be registered to sync."));
// TODO: Add a file comparison here. If the existing file is still the same
// then the file-to-copy we can share it.
_sharePath.clear();
@@ -500,7 +500,7 @@ void ShareDialog::slotNextSyncFinished( const SyncResult& result )
_uploadFails ++;
if( _uploadFails > 2 ) {
// stop the upload job
- displayInfo(tr("The file can not be synced."));
+ displayInfo(tr("The file cannot be synced."));
}
} else {
// it's there and the sync was successful.
diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 7d1770d..2eba46a 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -72,7 +72,7 @@
</font>
</property>
<property name="text">
- <string>OwnCloud Path:</string>
+ <string>ownCloud Path:</string>
</property>
</widget>
</item>
@@ -113,7 +113,7 @@
<item>
<widget class="QCheckBox" name="checkBox_expire">
<property name="text">
- <string>Set expiry date</string>
+ <string>Set expiration date</string>
</property>
</widget>
</item>
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 5a85593..f8d8eb1 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -78,7 +78,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
if( status == SyncFileItem::Success || status == SyncFileItem::Conflict) {
status = SyncFileItem::Restoration;
} else {
- _item._errorString += tr("; Restoration Failed: ") + errorString;
+ _item._errorString += tr("; Restoration Failed: %1").arg(errorString);
}
} else {
if( _item._errorString.isEmpty() ) {
@@ -101,7 +101,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
if (blacklist(_propagator->_journal, _item) && _item._hasBlacklistEntry) {
// do not error if the item was, and continues to be, blacklisted
status = SyncFileItem::FileIgnored;
- _item._errorString.prepend(tr("Continue blacklisting: "));
+ _item._errorString.prepend(tr("Continue blacklisting:") + " ");
}
break;
case SyncFileItem::Success:
diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp
index 2e46ad2..ecae78c 100644
--- a/src/libsync/propagateremotedelete.cpp
+++ b/src/libsync/propagateremotedelete.cpp
@@ -100,7 +100,7 @@ void PropagateRemoteDelete::slotDeleteJobFinished()
// Normaly we expect "204 No Content"
// If it is not the case, it might be because of a proxy or gateway intercepting the request, so we must
// throw an error.
- done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 204, but recieved \"%1 %2\".")
+ done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 204, but received \"%1 %2\".")
.arg(_item._httpErrorCode).arg(_job->reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString()));
return;
}
diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
index 50519c1..431d4e6 100644
--- a/src/libsync/propagateremotemkdir.cpp
+++ b/src/libsync/propagateremotemkdir.cpp
@@ -64,7 +64,7 @@ void PropagateRemoteMkdir::slotMkcolJobFinished()
// Normaly we expect "201 Created"
// If it is not the case, it might be because of a proxy or gateway intercepting the request, so we must
// throw an error.
- done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 201, but recieved \"%1 %2\".")
+ done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 201, but received \"%1 %2\".")
.arg(_item._httpErrorCode).arg(_job->reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString()));
return;
}
diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp
index c8dfeb9..e45affe 100644
--- a/src/libsync/propagateremotemove.cpp
+++ b/src/libsync/propagateremotemove.cpp
@@ -132,7 +132,7 @@ void PropagateRemoteMove::slotMoveJobFinished()
// Normaly we expect "201 Created"
// If it is not the case, it might be because of a proxy or gateway intercepting the request, so we must
// throw an error.
- done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 201, but recieved \"%1 %2\".")
+ done(SyncFileItem::NormalError, tr("Wrong HTTP code returned by server. Expected 201, but received \"%1 %2\".")
.arg(_item._httpErrorCode).arg(_job->reply()->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString()));
return;
}
diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index fecacdb..2483f1a 100644
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -56,8 +56,8 @@ static bool removeRecursively(const QString &path, QString &error)
QFile f(di.filePath());
ok = f.remove();
if (!ok) {
- error += PropagateLocalRemove::tr("Error removing '%1': %2; ").
- arg(QDir::toNativeSeparators(f.fileName()), f.errorString());
+ error += PropagateLocalRemove::tr("Error removing '%1': %2;").
+ arg(QDir::toNativeSeparators(f.fileName()), f.errorString()) + " ";
qDebug() << "Error removing " << f.fileName() << ':' << f.errorString();
}
}
@@ -67,8 +67,8 @@ static bool removeRecursively(const QString &path, QString &error)
if (success) {
success = QDir().rmdir(path);
if (!success) {
- error += PropagateLocalRemove::tr("Could not remove directory '%1'; ")
- .arg(QDir::toNativeSeparators(path));
+ error += PropagateLocalRemove::tr("Could not remove directory '%1';")
+ .arg(QDir::toNativeSeparators(path)) + " ";
qDebug() << "Error removing directory" << path;
}
}
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index b14011c..a5b47d4 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -138,7 +138,7 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
errStr = tr("CSync failed due to not handled permission deniend.");
break;
case CSYNC_STATUS_NOT_FOUND:
- errStr = tr("CSync failed to access "); // filename gets added.
+ 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.");
@@ -156,10 +156,10 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
errStr = tr("The mounted directory is temporarily not available on the server");
break;
case CSYNC_STATUS_OPENDIR_ERROR:
- errStr = tr("An error opening a directory happened");
+ errStr = tr("An error occurred while opening a directory");
break;
default:
- errStr = tr("An internal error number %1 happened.").arg( (int) err );
+ errStr = tr("An internal error number %1 occurred.").arg( (int) err );
}
return errStr;
--
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