[Pkg-owncloud-commits] [owncloud-client] 22/484: Coin the term 'folder sync connection'

[Sandro Knauß]

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 fdfab07d07db75025a02a1fdd4aa9cacccd1b2f6
Author: Phil Davis <phil.davis at inf.org>
Date:   Tue Sep 8 17:22:57 2015 +0545

    Coin the term 'folder sync connection'
    
    Proposed wording for issue
    https://github.com/owncloud/client/issues/3757
---
 src/gui/folderman.cpp            | 24 ++++++++++++++++--------
 src/gui/folderstatusdelegate.cpp |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index f47ed0c..f12fc88 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1154,27 +1154,35 @@ QString FolderMan::checkPathValidityForNewFolder(const QString& path, bool forNe
 
         if (QDir::cleanPath(f->path()) == QDir::cleanPath(userInput)
                 && QDir::cleanPath(QDir(f->path()).canonicalPath()) == QDir(userInput).canonicalPath()) {
-            return tr("The local path %1 is already an upload folder. Please pick another one!")
+            return tr("The local folder %1 is already used in a folder sync connection. "
+                      "Please pick another one!")
                 .arg(QDir::toNativeSeparators(userInput));
         }
         if (!forNewDirectory && QDir::cleanPath(folderDir).startsWith(QDir::cleanPath(userInput)+'/')) {
-            return tr("An already configured folder is contained in the current entry.");
+            return tr("The local folder %1 already contains a folder used in a folder sync connection. "
+                      "Please pick another one!")
+                .arg(QDir::toNativeSeparators(userInput));
         }
 
         QString absCleanUserFolder = QDir::cleanPath(QDir(userInput).canonicalPath())+'/';
         if (!forNewDirectory && QDir::cleanPath(folderDir).startsWith(absCleanUserFolder) ) {
-            return tr("The selected folder is a symbolic link. An already configured "
-                      "folder is contained in the folder this link is pointing to.");
+            return tr("The local folder %1 is a symbolic link. "
+                      "The link target already contains a folder used in a folder sync connection. "
+                      "Please pick another one!")
+                .arg(QDir::toNativeSeparators(userInput));
         }
 
         if (QDir::cleanPath(QString(userInput)).startsWith( QDir::cleanPath(folderDir)+'/')) {
-            return tr("An already configured folder contains the currently entered folder.");
+            return tr("The local folder %1 is already contained in a folder used in a folder sync connection. "
+                      "Please pick another one!")
+                .arg(QDir::toNativeSeparators(userInput));
         }
 
         if (absCleanUserFolder.startsWith( QDir::cleanPath(folderDir)+'/')) {
-            return tr("The selected folder is a symbolic link. An already configured folder "
-                      "is the parent of the current selected contains the folder this link is "
-                      "pointing to.");
+            return tr("The local folder %1 is a symbolic link. "
+                      "The link target is already contained in a folder used in a folder sync connection. "
+                      "Please pick another one!")
+                .arg(QDir::toNativeSeparators(userInput));
         }
     }
 
diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 2e37bd9..924fd45 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -30,7 +30,7 @@ namespace OCC {
 
 QString FolderStatusDelegate::addFolderText()
 {
-    return tr("Add Folder to Synchronize");
+    return tr("Add Folder Sync Connection");
 }
 
 //alocate each item size in listview.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git