[Pkg-owncloud-commits] [owncloud-client] 149/484: Use the term folder sync connection in more places #3757
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:31 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 fac00348d9a6be968f80bc385078ef807b639248
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Tue Oct 27 12:12:21 2015 +0100
Use the term folder sync connection in more places #3757
---
doc/visualtour.rst | 12 ++++++------
src/gui/accountsettings.cpp | 8 ++++----
src/gui/folderwizard.cpp | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/visualtour.rst b/doc/visualtour.rst
index f2b96fb..a8b28d3 100644
--- a/doc/visualtour.rst
+++ b/doc/visualtour.rst
@@ -51,8 +51,8 @@ Where:
* ``Connected to <ownCloud instance> as <user>``: Indicates the ownCloud server
which the client is syncing with and the user account on that server.
-* ``Add Folder...``: Provides the ability to add another folder to the sync
- (see ``Adding a folder``).
+* ``Add Folder Sync Connection...``: Provides the ability to add another folder to the sync
+ (see ``Adding a folder sync connection``).
* ``Pause/Resume``: Will pause the current sync or prevent the client from
starting a new sync. Resume will resume the sync process.
* ``Remove``: Will remove the selected folder from being synced. This is used,
@@ -74,11 +74,11 @@ Where:
.. image:: images/settings_account.png
:scale: 50 %
-Adding a Folder
-^^^^^^^^^^^^^^^
+Adding a Folder Sync Connection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Adding a new sync is initiated by clicking ``Add Folder...`` in the ``Account``
-settings.
+Adding a new sync is initiated by clicking ``Add Folder Sync Connection`` in
+the ``Account`` settings.
..note:: To add a folder, you must not already sync a folder that contains this
folder. By default, the wizard sets up the root folder of the ownCloud
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 6e42598..7a4a0f3 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -156,14 +156,14 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
QAction *ac = menu->addAction(tr("Open folder"));
connect(ac, SIGNAL(triggered(bool)), this, SLOT(slotOpenCurrentFolder()));
- ac = menu->addAction(tr("Choose What to Sync"));
+ ac = menu->addAction(tr("Choose what to sync"));
ac->setEnabled(folderConnected);
connect(ac, SIGNAL(triggered(bool)), this, SLOT(doExpand()));
ac = menu->addAction(folderPaused ? tr("Resume sync") : tr("Pause sync"));
connect(ac, SIGNAL(triggered(bool)), this, SLOT(slotEnableCurrentFolder()));
- ac = menu->addAction(tr("Remove sync"));
+ ac = menu->addAction(tr("Remove folder sync connection"));
connect(ac, SIGNAL(triggered(bool)), this, SLOT(slotRemoveCurrentFolder()));
menu->exec(tv->mapToGlobal(pos));
}
@@ -277,13 +277,13 @@ void AccountSettings::slotRemoveCurrentFolder()
qDebug() << "Remove Folder alias " << alias;
if( !alias.isEmpty() ) {
QMessageBox messageBox(QMessageBox::Question,
- tr("Confirm Sync Removal"),
+ tr("Confirm Folder Sync Connection Removal"),
tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
"<p><b>Note:</b> This will <b>not</b> delete any files.</p>").arg(alias),
QMessageBox::NoButton,
this);
QPushButton* yesButton =
- messageBox.addButton(tr("Stop syncing"), QMessageBox::YesRole);
+ messageBox.addButton(tr("Remove Folder Sync Connection"), QMessageBox::YesRole);
messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
messageBox.exec();
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 68b6b70..5453427 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -559,9 +559,9 @@ FolderWizard::FolderWizard(AccountPtr account, QWidget *parent)
}
setPage(Page_SelectiveSync, _folderWizardSelectiveSyncPage);
- setWindowTitle( tr("Add Folder") );
+ setWindowTitle( tr("Add Folder Sync Connection") );
setOptions(QWizard::CancelButtonOnLeft);
- setButtonText(QWizard::FinishButton, tr("Add Folder"));
+ setButtonText(QWizard::FinishButton, tr("Add Sync Connection"));
}
FolderWizard::~FolderWizard()
--
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