Merge remote-tracking branch 'origin/2.5'

 Conflicts:
	VERSION.cmake
	src/gui/generalsettings.ui
	src/libsync/propagateuploadng.cpp

1 files changed, 8 insertions, 7 deletions

diff --git a/test/testremotediscovery.cpp b/test/testremotediscovery.cpp
index 8609dee9b..4920a3b0a 100644
--- a/test/testremotediscovery.cpp
+++ b/test/testremotediscovery.cpp
@@ -55,13 +55,14 @@ private slots:
         QTest::addColumn<int>("errorKind");
         QTest::addColumn<QString>("expectedErrorString");
 
-        QTest::newRow("404") << 404 << "B"; // The filename should be in the error message
-        QTest::newRow("500") << 500 << "Internal Server Fake Error"; // the message from FakeErrorReply
-        QTest::newRow("503") << 503 << "";
-        QTest::newRow("200") << 200 << ""; // 200 should be an error since propfind should return 207
-        QTest::newRow("InvalidXML") << +InvalidXML << "";
-        QTest::newRow("MissingPermissions") << +MissingPermissions << "missing data";
-        QTest::newRow("Timeout") << +Timeout << "";
+        QTest::newRow("404") << 404 << "File or directory not found: B";
+        QTest::newRow("500") << 500 << "An error occurred while opening a folder B: Internal Server Fake Error";
+        QTest::newRow("503") << 503 << "An error occurred while opening a folder B: Internal Server Fake Error";
+        // 200 should be an error since propfind should return 207
+        QTest::newRow("200") << 200 << "An error occurred while opening a folder B: Internal Server Fake Error";
+        QTest::newRow("InvalidXML") << +InvalidXML << "An error occurred while opening a folder B: Unknown error";
+        QTest::newRow("MissingPermissions") << +MissingPermissions << "A HTTP transmission error happened. B: The server file discovery reply is missing data.";
+        QTest::newRow("Timeout") << +Timeout << "An error occurred while opening a folder B: Operation canceled";
     }