Use the term folder sync connection in more places #3757

diff --git a/doc/visualtour.rst b/doc/visualtour.rst
index f2b96fb1ec06445f0f39a7f8ed23c8fdc8c40134..a8b28d309b9eaf5de5c410a79ed658cc21444367 100644 (file)
--- 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 6e4259870dc19e64fda7343bb4564f1b5659ae88..7a4a0f3c3654b547516af5483e3c7dadec34d48a 100644 (file)
--- 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 68b6b70abb1d89026294500b2e1cd98db31dc1a1..54534278e243f9cf85b547c06b193b3fbe95d265 100644 (file)
--- 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()