[Pkg-owncloud-commits] [owncloud-client] 272/470: ProgressDispatcher: Improve wording about conflicts.

[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 252aea25dacfff7d5ab6c12be9a97e1223fb2c35
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 5 16:38:18 2016 +0200

    ProgressDispatcher: Improve wording about conflicts.
---
 src/libsync/progressdispatcher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp
index c8dcbf5..5175071 100644
--- a/src/libsync/progressdispatcher.cpp
+++ b/src/libsync/progressdispatcher.cpp
@@ -34,7 +34,7 @@ QString Progress::asResultString( const SyncFileItem& item)
             return QCoreApplication::translate( "progress", "Uploaded");
         }
     case CSYNC_INSTRUCTION_CONFLICT:
-        return QCoreApplication::translate( "progress", "Server version downloaded, renamed conflicting local file");
+        return QCoreApplication::translate( "progress", "Server version downloaded, copied changed local file into conflict file");
     case CSYNC_INSTRUCTION_REMOVE:
         return QCoreApplication::translate( "progress", "Deleted");
     case CSYNC_INSTRUCTION_EVAL_RENAME:

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