[Pkg-owncloud-commits] [owncloud-client] 50/484: GUI comment and message typos for master
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:11 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 b8ccbbc72a183becc9c6d372297b851e0cd39161
Author: Phil Davis <phil.davis at inf.org>
Date: Mon Oct 5 10:06:19 2015 +0545
GUI comment and message typos for master
---
src/gui/CMakeLists.txt | 2 +-
src/gui/accountmanager.h | 6 +++---
src/gui/application.cpp | 8 ++++----
src/gui/creds/shibbolethcredentials.cpp | 2 +-
src/gui/creds/shibbolethcredentials.h | 2 +-
src/gui/folder.cpp | 8 ++++----
src/gui/folderman.cpp | 20 ++++++++++----------
src/gui/folderman.h | 6 +++---
src/gui/folderstatusdelegate.cpp | 2 +-
src/gui/folderstatusmodel.cpp | 12 ++++++------
src/gui/folderstatusmodel.h | 6 +++---
src/gui/folderwatcher.cpp | 4 ++--
src/gui/folderwatcher.h | 6 +++---
src/gui/logbrowser.cpp | 2 +-
src/gui/owncloudgui.cpp | 12 ++++++------
src/gui/owncloudsetupwizard.cpp | 4 ++--
src/gui/proxyauthhandler.h | 2 +-
src/gui/quotainfo.cpp | 2 +-
src/gui/quotainfo.h | 6 +++---
src/gui/selectivesyncdialog.cpp | 2 +-
src/gui/selectivesyncdialog.h | 2 +-
src/gui/settingsdialog.cpp | 2 +-
src/gui/settingsdialogmac.cpp | 2 +-
src/gui/sharedialog.cpp | 8 ++++----
src/gui/socketapi.cpp | 4 ++--
src/gui/updater/ocupdater.cpp | 2 +-
src/gui/updater/ocupdater.h | 8 ++++----
src/gui/wizard/owncloudadvancedsetuppage.cpp | 3 ++-
28 files changed, 73 insertions(+), 72 deletions(-)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 6a20a78..e9a18be 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -291,7 +291,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
install(CODE "
- message(STATUS \"Deploying (Qt) dependencies and fixing library pathes...\")
+ message(STATUS \"Deploying (Qt) dependencies and fixing library paths...\")
execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE})
" COMPONENT RUNTIME)
endif()
diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h
index eed8e43..bf5245a 100644
--- a/src/gui/accountmanager.h
+++ b/src/gui/accountmanager.h
@@ -36,13 +36,13 @@ public:
void save(bool saveCredentials = true);
/**
- * Creates account objects from from a given settings file.
+ * Creates account objects from a given settings file.
* return true if the account was restored
*/
bool restore();
/**
- * Add this account in the list of saved account.
+ * Add this account in the list of saved accounts.
* Typically called from the wizard
*/
AccountState *addAccount(const AccountPtr &newAccount);
@@ -54,7 +54,7 @@ public:
/**
* Return a list of all accounts.
- * (this is a list of QSharedPointer for internal reason, one should normaly not keep a copy of them)
+ * (this is a list of QSharedPointer for internal reasons, one should normally not keep a copy of them)
*/
QList<AccountStatePtr> accounts() { return _accounts; }
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index c477c55..7c96077 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -104,7 +104,7 @@ Application::Application(int &argc, char **argv) :
{
_startedAt.start();
-// TODO: Can't set this without breaking current config pathes
+// TODO: Can't set this without breaking current config paths
// setOrganizationName(QLatin1String(APPLICATION_VENDOR));
setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
setApplicationName( _theme->appNameGUI() );
@@ -179,7 +179,7 @@ Application::Application(int &argc, char **argv) :
connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection()));
_checkConnectionTimer.setInterval(32 * 1000); // check for connection every 32 seconds.
_checkConnectionTimer.start();
- // Also check immediatly
+ // Also check immediately
QTimer::singleShot( 0, this, SLOT( slotCheckConnection() ));
// Update checks
@@ -451,7 +451,7 @@ void Application::setHelp()
QString substLang(const QString &lang)
{
- // Map the more apropriate script codes
+ // Map the more appropriate script codes
// to country codes as used by Qt and
// transifex translation conventions.
@@ -493,7 +493,7 @@ void Application::setupTranslations()
// Permissive approach: Qt and keychain translations
// may be missing, but Qt translations must be there in order
// for us to accept the language. Otherwise, we try with the next.
- // "en" is an exeption as it is the default language and may not
+ // "en" is an exception as it is the default language and may not
// have a translation file provided.
qDebug() << Q_FUNC_INFO << "Using" << lang << "translation";
setProperty("ui_lang", lang);
diff --git a/src/gui/creds/shibbolethcredentials.cpp b/src/gui/creds/shibbolethcredentials.cpp
index 0a1cac4..d0e29ed 100644
--- a/src/gui/creds/shibbolethcredentials.cpp
+++ b/src/gui/creds/shibbolethcredentials.cpp
@@ -223,7 +223,7 @@ void ShibbolethCredentials::onShibbolethCookieReceived(const QNetworkCookie& shi
void ShibbolethCredentials::slotFetchUser()
{
// We must first do a request to webdav so the session is enabled.
- // (because for some reason we wan't access the API without that.. a bug in the server maybe?)
+ // (because for some reason we can't access the API without that.. a bug in the server maybe?)
EntityExistsJob* job = new EntityExistsJob(_account->sharedFromThis(), _account->davPath(), this);
connect(job, SIGNAL(exists(QNetworkReply*)), this, SLOT(slotFetchUserHelper()));
job->setIgnoreCredentialFailure(true);
diff --git a/src/gui/creds/shibbolethcredentials.h b/src/gui/creds/shibbolethcredentials.h
index 99ecdac..2fc57bf 100644
--- a/src/gui/creds/shibbolethcredentials.h
+++ b/src/gui/creds/shibbolethcredentials.h
@@ -44,7 +44,7 @@ Q_OBJECT
public:
ShibbolethCredentials();
- /* create a credentials for an already connected account */
+ /* create credentials for an already connected account */
ShibbolethCredentials(const QNetworkCookie &cookie);
void setAccount(Account* account) Q_DECL_OVERRIDE;
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 64c9941..e5d8c2c 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -88,14 +88,14 @@ Folder::Folder(const FolderDefinition& definition,
bool Folder::init()
{
- // We need to reconstruct the url because the path need to be fully decoded, as csync will re-encode the path:
+ // We need to reconstruct the url because the path needs to be fully decoded, as csync will re-encode the path:
// Remember that csync will just append the filename to the path and pass it to the vio plugin.
// csync_owncloud will then re-encode everything.
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QUrl url = remoteUrl();
QString url_string = url.scheme() + QLatin1String("://") + url.authority(QUrl::EncodeDelimiters) + url.path(QUrl::FullyDecoded);
#else
- // Qt4 was broken anyway as it did not encode the '#' as it should have done (it was actually a provlem when parsing the path from QUrl::setPath
+ // Qt4 was broken anyway as it did not encode the '#' as it should have done (it was actually a problem when parsing the path from QUrl::setPath
QString url_string = remoteUrl().toString();
#endif
url_string = Utility::toCSyncScheme(url_string);
@@ -1017,14 +1017,14 @@ void Folder::slotSyncFinished()
}
if (_syncResult.status() == SyncResult::Success) {
- // Clear the white list as all the folder that should be on that list are sync-ed
+ // Clear the white list as all the folders that should be on that list are sync-ed
journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList, QStringList());
}
emit syncStateChange();
// The syncFinished result that is to be triggered here makes the folderman
- // clearing the current running sync folder marker.
+ // clear the current running sync folder marker.
// Lets wait a bit to do that because, as long as this marker is not cleared,
// file system change notifications are ignored for that folder. And it takes
// some time under certain conditions to make the file system notifications
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index e12abbc..c5ff99e 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -244,7 +244,7 @@ int FolderMan::setupFoldersMigration()
dir.setFilter(QDir::Files | QDir::Hidden);
QStringList list = dir.entryList();
- // Normaly there should be only one account when migrating.
+ // Normally there should be only one account when migrating.
AccountState* accountState = AccountManager::instance()->accounts().value(0).data();
foreach ( const QString& alias, list ) {
Folder *f = setupFolderFromOldConfigFile( alias, accountState );
@@ -345,8 +345,8 @@ Folder* FolderMan::setupFolderFromOldConfigFile(const QString &file, AccountStat
qDebug() << " ` -> setting up:" << file;
QString escapedAlias(file);
- // check the unescaped variant (for the case the filename comes out
- // of the directory listing. If the file is not existing, escape the
+ // check the unescaped variant (for the case when the filename comes out
+ // of the directory listing). If the file does not exist, escape the
// file and try again.
QFileInfo cfgFile( _folderConfigPath, file);
@@ -356,7 +356,7 @@ Folder* FolderMan::setupFolderFromOldConfigFile(const QString &file, AccountStat
cfgFile.setFile( _folderConfigPath, escapedAlias );
}
if( !cfgFile.isReadable() ) {
- qDebug() << "Can not read folder definition for alias " << cfgFile.filePath();
+ qDebug() << "Cannot read folder definition for alias " << cfgFile.filePath();
return folder;
}
@@ -594,12 +594,12 @@ void FolderMan::slotAccountStateChanged()
}
}
-// only enable or disable foldermans will to schedule and do syncs.
+// only enable or disable foldermans will schedule and do syncs.
// this is not the same as Pause and Resume of folders.
void FolderMan::setSyncEnabled( bool enabled )
{
if (!_syncEnabled && enabled && !_scheduleQueue.isEmpty()) {
- // We have things in our queue that were waiting the the connection to go back on.
+ // We have things in our queue that were waiting for the connection to come back on.
startScheduledSyncSoon();
}
_syncEnabled = enabled;
@@ -906,7 +906,7 @@ bool FolderMan::startFromScratch( const QString& localFolder )
_socketApi->slotUnregisterPath(f->alias());
}
f->journalDb()->close();
- f->slotTerminateSync(); // Normaly it should not be running, but viel hilft viel
+ f->slotTerminateSync(); // Normally it should not be running, but viel hilft viel
}
}
@@ -936,7 +936,7 @@ void FolderMan::setDirtyProxy(bool value)
if (f->accountState() && f->accountState()->account()
&& f->accountState()->account()->networkAccessManager()) {
- // Need to do this have us not use the old determined system proxy
+ // Need to do this so we do not use the old determined system proxy
f->accountState()->account()->networkAccessManager()->setProxy(
QNetworkProxy(QNetworkProxy::DefaultProxy));
}
@@ -962,7 +962,7 @@ SyncResult FolderMan::accountStatus(const QList<Folder*> &folders)
int cnt = folders.count();
// if one folder: show the state of the one folder.
- // if more folder:
+ // if more folders:
// if one of them has an error -> show error
// if one is paused, but others ok, show ok
// do not show "problem" in the tray
@@ -1079,7 +1079,7 @@ QString FolderMan::statusToString( SyncResult syncStatus, bool paused ) const
folderMessage = tr( "Undefined State." );
break;
case SyncResult::NotYetStarted:
- folderMessage = tr( "Waits to start syncing." );
+ folderMessage = tr( "Waiting to start syncing." );
break;
case SyncResult::SyncPrepare:
folderMessage = tr( "Preparing for sync." );
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 0dd0522..a1e1ee3 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -92,7 +92,7 @@ public:
/**
* Check if @a path is a valid path for a new folder considering the already sync'ed items.
- * Make sure that this folder, or any subfolder is not sync'ed alrady.
+ * Make sure that this folder, or any subfolder is not sync'ed already.
*
* \a forNewDirectory is internal and is used for recursion.
*
@@ -123,7 +123,7 @@ signals:
/**
* signal to indicate a folder has changed its sync state.
*
- * Attention: The folder may be zero. Do a general update of the state than.
+ * Attention: The folder may be zero. Do a general update of the state then.
*/
void folderSyncStateChange(Folder*);
@@ -162,7 +162,7 @@ public slots:
// slot to add a folder to the syncing queue
void slotScheduleSync(Folder*);
- // slot to scheule an ETag job
+ // slot to schedule an ETag job
void slotScheduleETagJob ( const QString &alias, RequestEtagJob *job);
void slotEtagJobDestroyed (QObject*);
void slotRunOneEtagJob();
diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 924fd45..9ea0346 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -33,7 +33,7 @@ QString FolderStatusDelegate::addFolderText()
return tr("Add Folder Sync Connection");
}
-//alocate each item size in listview.
+// allocate each item size in listview.
QSize FolderStatusDelegate::sizeHint(const QStyleOptionViewItem & option ,
const QModelIndex & index) const
{
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index adfae66..f25f4bd 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -123,7 +123,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
auto remotePath = _folders.at(0)._folder->remotePath();
if (remotePath.isEmpty() || remotePath == QLatin1String("/")) {
// Syncing the entire owncloud: disable the add folder button (#3438)
- return tr("Adding folder is disabled because your are already syncing all your files. "
+ return tr("Adding folder is disabled because you are already syncing all your files. "
"If you want to sync multiple folders, please remove the currently "
"configured root folder.");
}
@@ -192,7 +192,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
} else if( status == SyncResult::Undefined ) {
return theme->syncStateIcon( SyncResult::SyncRunning);
} else {
- // kepp the previous icon for the prepare phase.
+ // keep the previous icon for the prepare phase.
if( status == SyncResult::Problem) {
return theme->syncStateIcon( SyncResult::Success);
} else {
@@ -227,7 +227,7 @@ bool FolderStatusModel::setData(const QModelIndex& index, const QVariant& value,
info->_checked = checked;
if (checked == Qt::Checked) {
// If we are checked, check that we may need to check the parent as well if
- // all the sibilings are also checked
+ // all the siblings are also checked
QModelIndex parent = index.parent();
auto parentInfo = infoForIndex(parent);
if (parentInfo && parentInfo->_checked != Qt::Checked) {
@@ -670,7 +670,7 @@ void FolderStatusModel::slotApplySelectiveSync()
// clear the undecided list
folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, QStringList());
- // do the sync if there was changes
+ // do the sync if there were changes
auto changes = (oldBlackListSet - blackListSet) + (blackListSet - oldBlackListSet);
if (!changes.isEmpty()) {
if (folder->isBusy()) {
@@ -838,7 +838,7 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
.arg(currentFile).arg(totalFileCount)
.arg( Utility::durationToDescriptiveString(progress.totalProgress().estimatedEta) );
} else if (totalFileCount > 0) {
- // Don't attemt to estimate the time left if there is no kb to transfer.
+ // Don't attempt to estimate the time left if there is no kb to transfer.
overallSyncString = tr("file %1 of %2") .arg(currentFile).arg(totalFileCount);
}
@@ -846,7 +846,7 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
int overallPercent = 0;
if( totalFileCount > 0 ) {
- // Add one 'byte' for each files so the percentage is moving when deleting or renaming files
+ // Add one 'byte' for each file so the percentage is moving when deleting or renaming files
overallPercent = qRound(double(completedSize + completedFile)/double(totalSize + totalFileCount) * 100.0);
}
pi->_overallPercent = qBound(0, overallPercent, 100);
diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index c36ffc1..9324080 100644
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -61,7 +61,7 @@ public:
qint64 _size;
bool _fetched; // If we did the LSCOL for this folder already
bool _fetching;
- bool _isUndecided; // undecided folder are the big folder that the user has not accepted yet
+ bool _isUndecided; // undecided folders are the big folders that the user has not accepted yet
bool _hasError; // If the last fetching job ended in an error
Qt::CheckState _checked;
@@ -88,7 +88,7 @@ public:
/**
* return a QModelIndex for the given path within the given folder.
- * Note: this method returns an invalid index if the path was not fetch from the server before
+ * Note: this method returns an invalid index if the path was not fetched from the server before
*/
QModelIndex indexForPath(Folder *f, const QString &path) const;
@@ -119,7 +119,7 @@ private:
signals:
void dirtyChanged();
- void suggestExpand(const QModelIndex &); // Tell the view that this item should be expanded because it has a undecided item
+ void suggestExpand(const QModelIndex &); // Tell the view that this item should be expanded because it has an undecided item
};
} // namespace OCC
diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
index 4ff8f23..217ebd1 100644
--- a/src/gui/folderwatcher.cpp
+++ b/src/gui/folderwatcher.cpp
@@ -75,8 +75,8 @@ void FolderWatcher::changeDetected( const QStringList& paths )
// TODO: this shortcut doesn't look very reliable:
// - why is the timeout only 1 second?
- // - what if there are more than one file being updated frequently?
- // - why do we skip the file alltogether instead of e.g. reducing the upload frequency?
+ // - what if there is more than one file being updated frequently?
+ // - why do we skip the file altogether instead of e.g. reducing the upload frequency?
// Check if the same path was reported within the last second.
QSet<QString> pathsSet = paths.toSet();
diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h
index c452640..15fe223 100644
--- a/src/gui/folderwatcher.h
+++ b/src/gui/folderwatcher.h
@@ -33,14 +33,14 @@ class FolderWatcherPrivate;
class Folder;
/**
- * @brief Montiors a directory recursively for changes
+ * @brief Monitors a directory recursively for changes
*
* Folder Watcher monitors a directory and its sub directories
* for changes in the local file system. Changes are signalled
* through the pathChanged() signal.
*
* Note that if new folders are created, this folderwatcher class
- * does not automatically adds them to the list of monitored
+ * does not automatically add them to the list of monitored
* dirs. That is the responsibility of the user of this class to
* call addPath() with the new dir.
*
@@ -60,7 +60,7 @@ public:
/**
* Not all backends are recursive by default.
* Those need to be notified when a directory is added or removed while the watcher is disabled.
- * This is a no-op for backend that are recursive
+ * This is a no-op for backends that are recursive
*/
void addPath(const QString&);
void removePath(const QString&);
diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp
index 3474370..18b2491 100644
--- a/src/gui/logbrowser.cpp
+++ b/src/gui/logbrowser.cpp
@@ -110,7 +110,7 @@ LogBrowser::LogBrowser(QWidget *parent) :
setModal(false);
- // Direct connection for log comming from this thread, and queued for the one in a different thread
+ // Direct connection for log coming from this thread, and queued for the one in a different thread
connect(Logger::instance(), SIGNAL(newLog(QString)),this,SLOT(slotNewLog(QString)), Qt::AutoConnection);
QAction *showLogWindow = new QAction(this);
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 0ad7a31..cca78cc 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -107,7 +107,7 @@ ownCloudGui::ownCloudGui(Application *parent) :
// Use this to do platform specific code to make overlay icons appear
// in the gui
-// MacOSX: perform a AppleScript code peace to load the Finder Plugin.
+// MacOSX: perform a AppleScript code piece to load the Finder Plugin.
void ownCloudGui::setupOverlayIcons()
@@ -136,7 +136,7 @@ void ownCloudGui::setupOverlayIcons()
p.waitForFinished(5000);
QByteArray result = p.readAll();
QString resultAsString(result); // if appropriate
- qDebug() << "Laod Finder Overlay-Plugin: " << resultAsString << ": " << p.exitCode()
+ qDebug() << "Load Finder Overlay-Plugin: " << resultAsString << ": " << p.exitCode()
<< (p.exitCode() != 0 ? p.errorString() : QString::null);
} else {
qDebug() << finderExtension << "does not exist! Finder Overlay Plugin loading failed";
@@ -269,7 +269,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
return;
}
- // display the info of the least successful sync (eg. not just display the result of the latest sync
+ // display the info of the least successful sync (eg. do not just display the result of the latest sync)
QString trayMessage;
FolderMan *folderMan = FolderMan::instance();
Folder::Map map = folderMan->map();
@@ -412,7 +412,7 @@ void ownCloudGui::setupContextMenu()
#endif
}
_contextMenu->setTitle(Theme::instance()->appNameGUI() );
- // We must call deleteLater because we might be called from the press in one of the action.
+ // We must call deleteLater because we might be called from the press in one of the actions.
foreach (auto menu, _accountMenus) { menu->deleteLater(); }
_accountMenus.clear();
if (accountList.count() > 1) {
@@ -486,7 +486,7 @@ void ownCloudGui::slotShowOptionalTrayMessage(const QString &title, const QStrin
/*
- * open the folder with the given Alais
+ * open the folder with the given Alias
*/
void ownCloudGui::slotFolderOpenAction( const QString& alias )
{
@@ -580,7 +580,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
if (!progress._lastCompletedItem.isEmpty() && !Progress::isIgnoredKind(progress._lastCompletedItem._status)) {
if (Progress::isWarningKind(progress._lastCompletedItem._status)) {
- // display a warn icon if warnings happend.
+ // display a warn icon if warnings happened.
QIcon warnIcon(":/client/resources/warning");
_actionRecent->setIcon(warnIcon);
}
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 9ff5cf1..865674a 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -129,7 +129,7 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString)
// Reset the proxy which might had been determined previously in ConnectionValidator::checkServerAndAuth()
// when there was a previous account.
account->networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
- // Set fake credentials beforfe we check what credential it actually is.
+ // Set fake credentials before we check what credential it actually is.
account->setCredentials(CredentialsFactory::create("dummy"));
CheckServerJob *job = new CheckServerJob(_ocWizard->account(), this);
job->setIgnoreCredentialFailure(true);
@@ -439,7 +439,7 @@ bool OwncloudSetupWizard::ensureStartFromScratch(const QString &localFolder) {
return renameOk;
}
-// Method executed when the user ends has finished the basic setup.
+// Method executed when the user end has finished the basic setup.
void OwncloudSetupWizard::slotAssistantFinished( int result )
{
FolderMan *folderMan = FolderMan::instance();
diff --git a/src/gui/proxyauthhandler.h b/src/gui/proxyauthhandler.h
index eae20f1..9b53a50 100644
--- a/src/gui/proxyauthhandler.h
+++ b/src/gui/proxyauthhandler.h
@@ -74,7 +74,7 @@ private:
QString keychainUsernameKey() const;
QString keychainPasswordKey() const;
- /// The hostname:port of the current proxy, used for detetcting switches
+ /// The hostname:port of the current proxy, used for detecting switches
/// to a different proxy.
QString _proxy;
diff --git a/src/gui/quotainfo.cpp b/src/gui/quotainfo.cpp
index 9035a1c..49c188b 100644
--- a/src/gui/quotainfo.cpp
+++ b/src/gui/quotainfo.cpp
@@ -100,7 +100,7 @@ void QuotaInfo::slotCheckQuota()
void QuotaInfo::slotUpdateLastQuota(const QVariantMap &result)
{
- // The server can return frational bytes (#1374)
+ // The server can return fractional bytes (#1374)
// <d:quota-available-bytes>1374532061.2</d:quota-available-bytes>
quint64 avail = result["quota-available-bytes"].toDouble();
_lastQuotaUsedBytes = result["quota-used-bytes"].toDouble();
diff --git a/src/gui/quotainfo.h b/src/gui/quotainfo.h
index 294ad6d..b9ada1a 100644
--- a/src/gui/quotainfo.h
+++ b/src/gui/quotainfo.h
@@ -29,7 +29,7 @@ class PropfindJob;
*
* It is typically owned by the AccountSetting page.
*
- * The quota is requested if those 3 conditions are met:
+ * The quota is requested if these 3 conditions are met:
* - This object is active via setActive() (typically if the settings page is visible.)
* - The account is connected.
* - Every 30 seconds (defaultIntervalT) or 5 seconds in case of failure (failIntervalT)
@@ -52,7 +52,7 @@ public:
/**
* When the quotainfo is active, it requests the quota at regular interval.
- * When setting it to active it will request the quota imediatly if the last time
+ * When setting it to active it will request the quota immediately if the last time
* the quota was requested was more than the interval
*/
void setActive(bool active);
@@ -75,7 +75,7 @@ private:
qint64 _lastQuotaTotalBytes;
qint64 _lastQuotaUsedBytes;
QTimer _jobRestartTimer;
- QDateTime _lastQuotaRecieved; // the time at which de quota was recieved last
+ QDateTime _lastQuotaRecieved; // the time at which the quota was received last
bool _active; // if we should check at regular interval (when the UI is visible)
QPointer<PropfindJob> _job; // the currently running job
};
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
index b041ee8..f24e42f 100644
--- a/src/gui/selectivesyncdialog.cpp
+++ b/src/gui/selectivesyncdialog.cpp
@@ -271,7 +271,7 @@ void SelectiveSyncTreeView::slotItemChanged(QTreeWidgetItem *item, int col)
if (item->checkState(0) == Qt::Checked) {
// If we are checked, check that we may need to check the parent as well if
- // all the sibilings are also checked
+ // all the siblings are also checked
QTreeWidgetItem *parent = item->parent();
if (parent && parent->checkState(0) != Qt::Checked) {
bool hasUnchecked = false;
diff --git a/src/gui/selectivesyncdialog.h b/src/gui/selectivesyncdialog.h
index f64fde3..fd5a5e2 100644
--- a/src/gui/selectivesyncdialog.h
+++ b/src/gui/selectivesyncdialog.h
@@ -38,7 +38,7 @@ public:
QStringList createBlackList(QTreeWidgetItem* root = 0) const;
QStringList oldBlackList() const;
- //Estimate the total size of checked item (recursively)
+ // Estimates the total size of checked items (recursively)
qint64 estimatedSize(QTreeWidgetItem *root = 0);
void refreshFolders();
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index f00fd7a..2967027 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -251,7 +251,7 @@ QIcon SettingsDialog::createColorAwareIcon(const QString &name)
{
QColor bg(palette().base().color());
QImage img(name);
- // account for different sensitivty of the human eye to certain colors
+ // account for different sensitivity of the human eye to certain colors
double treshold = 1.0 - ( 0.299 * bg.red() + 0.587 * bg.green() + 0.114 * bg.blue())/255.0;
if (treshold > 0.5) {
img.invertPixels(QImage::InvertRgb);
diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp
index e7b95dc..13134a2 100644
--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -41,7 +41,7 @@ namespace OCC {
SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
: MacPreferencesWindow(parent), _gui(gui)
{
- // do not show minimize button. There is no use, and retoring the
+ // do not show minimize button. There is no use, and restoring the
// dialog from minimize is broken in MacPreferencesWindow
setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint |
Qt::WindowCloseButtonHint | Qt::WindowMaximizeButtonHint);
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index bd1245d..bcfe169 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -117,7 +117,7 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
// check if the file is already inside of a synced folder
if( sharePath.isEmpty() ) {
// The file is not yet in an ownCloud synced folder. We could automatically
- // copy it over, but that is skipped as not all questions can be anwered that
+ // copy it over, but that is skipped as not all questions can be answered that
// are involved in that, see https://github.com/owncloud/client/issues/2732
//
// _ui->checkBox_shareLink->setEnabled(false);
@@ -142,7 +142,7 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
// Parse capabilities
- // If password is enforced make don't allow users to disable it
+ // If password is enforced then don't allow users to disable it
if (_account->capabilities().publicLinkEnforcePassword()) {
_ui->checkBox_password->setEnabled(false);
}
@@ -224,7 +224,7 @@ void ShareDialog::slotPasswordReturnPressed()
void ShareDialog::slotPasswordChanged(const QString& newText)
{
- // disable the set-passwort button
+ // disable the set-password button
_ui->pushButton_setPassword->setEnabled( newText.length() > 0 );
}
@@ -639,7 +639,7 @@ bool ShareDialog::uploadExternalFile()
_ui->label_sharePath->setText(tr("A sync file with the same name exists. "
"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.
+ // as the file-to-copy we can share it.
_sharePath.clear();
} else {
_uploadFails = 0;
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index b9c5293..a605366 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -270,7 +270,7 @@ void SocketApi::slotSyncItemDiscovered(const QString &folder, const SyncFileItem
QString path = f->path() + item.destination();
// the trailing slash for directories must be appended as the filenames coming in
- // from the plugins have that too. Otherwise the according entry item is not found
+ // from the plugins have that too. Otherwise the matching entry item is not found
// in the plugin.
if( item._type == SyncFileItem::Type::Directory ) {
path += QLatin1Char('/');
@@ -544,7 +544,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);
}
- // Error if it is in the selective sync blacklistr
+ // Error if it is in the selective sync blacklist
foreach(const auto &s, folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList)) {
if (fileNameSlash.startsWith(s)) {
return SyncFileStatus(SyncFileStatus::STATUS_ERROR);
diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index 051d3ca..64f6927 100644
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -425,7 +425,7 @@ PassiveUpdateNotifier::PassiveUpdateNotifier(const QUrl &url, QObject *parent)
// remember the version of the currently running binary. On Linux it might happen that the
// package management updates the package while the app is running. This is detected in the
// updater slot: If the installed binary on the hd has a different version than the one
- // running, the running app is restart. That happens in folderman.
+ // running, the running app is restarted. That happens in folderman.
_runningAppVersion = Utility::versionOfInstalledBinary();
}
diff --git a/src/gui/updater/ocupdater.h b/src/gui/updater/ocupdater.h
index 270dccb..2cbd6cc 100644
--- a/src/gui/updater/ocupdater.h
+++ b/src/gui/updater/ocupdater.h
@@ -35,15 +35,15 @@ namespace OCC {
* This class schedules regular update checks. It also checks the config
* if update checks are wanted at all.
*
- * To reflect that all platforms have its own update scheme, a little
+ * To reflect that all platforms have their own update scheme, a little
* complex class design was set up:
*
* For Windows and Linux, the updaters are inherited from OCUpdater, while
* the MacOSX SparkleUpdater directly uses the class Updater. On windows,
* NSISUpdater starts the update if a new version of the client is available.
* On MacOSX, the sparkle framework handles the installation of the new
- * version. On Linux, the update capabilities by the underlying linux distro
- * is relied on, and thus the PassiveUpdateNotifier just shows a notification
+ * version. On Linux, the update capabilities of the underlying linux distro
+ * are relied on, and thus the PassiveUpdateNotifier just shows a notification
* if there is a new version once at every start of the application.
*
* Simple class diagram of the updater:
@@ -83,7 +83,7 @@ private:
};
/**
- * @brief Class that uses an ownCloud propritary XML format to fetch update information
+ * @brief Class that uses an ownCloud proprietary XML format to fetch update information
* @ingroup gui
*/
class OCUpdater : public QObject, public Updater
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 3538fb7..9a64a98 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -253,7 +253,7 @@ void OwncloudAdvancedSetupPage::slotSelectFolder()
void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
{
- // Because clicking on it also changes it, restore it to the previous state in case the user cancel the dialog
+ // Because clicking on it also changes it, restore it to the previous state in case the user cancelled the dialog
_ui.rSyncEverything->setChecked(_selectiveSyncBlacklist.isEmpty());
AccountPtr acc = static_cast<OwncloudWizard *>(wizard())->account();
@@ -308,3 +308,4 @@ void OwncloudAdvancedSetupPage::slotQuotaRetrieved(const QVariantMap &result)
}
} // namespace OCC
+
--
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