VERSION.cmake: 2.4.0-rc1

2026-04-07 01:34:16 +02:00 · 2017-12-04 13:55:30 +01:00
50 changed files with 416 additions and 782 deletions
--- a/7
+++ b/7
@@ -2,7 +2,7 @@ ChangeLog
 =========

 version 2.4.0 (2017-12-XX)
-* If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
+* If you're using 2.4.0 alpha1, please upgrade as the alpha1 had an issue with hidden files!
 * OAuth2 authentication support by opening external browser (#5668)
 * Shibboleth: Change to use OAuth2 if supported (#6198)
 * Sharing: Add support for multiple public link shares (#5655)
@@ -66,7 +66,7 @@ version 2.4.0 (2017-12-XX)
 * Sync: Upload conflict files if OWNCLOUD_UPLOAD_CONFLICT_FILES environment variable is set (#6038)
 * Sync: Blacklist: Don't let errors become warnings (#5516)
 * Sync: Check etag again after active sync (#4116)
-* Sync: Rename handling fixes: duplicate file ids (#6096, #6212)
+* Sync: Rename handling fixes: duplicate file ids (#6096)
 * Sync: Rename handling fixes: File size must be equal
 * Sync: Rename handling: Fix duplicate files on abort/resume sync (#5949)
 * Sync: Add capability for invalid filename regexes (#6092)
@@ -80,7 +80,6 @@ version 2.4.0 (2017-12-XX)
 * Crash fixes
 * Test improvements
 * Small UI layout fixes
-* Performance improvements
 * Maintenance Mode: Detect maintenance mode (#4485)
 * Maintenance Mode: Add a 1 to 5 min reconnection delay (#5872)
 * HTTP: Send a unique X-Request-ID with each request (#5853)
@@ -96,7 +95,6 @@ version 2.4.0 (2017-12-XX)
 * Compilation: Remove Qt 4 code (#6025, #5702, #5505)
 * Harmonize source code style with clang-format (#5732)
 * Switch over to Qt 5 function pointer signal/slot syntax (#6041)
-* Compile with stack-smashing protection
 * Updater: Rudimentary support for beta channel (#6048)

 version 2.3.4 (2017-11-02)
@@ -112,7 +110,6 @@ version 2.3.3 (2017-08-29)
 * Overlay Icons: Fix potential hangs on Windows
 * SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
 * SyncJournalDB: Log reason for sqlite3 opening errors
-* Notifications: Proapgate "Dismiss" button action to server (#5922)
 * Switch Linux build also to Qt 5.6.2 (#5470)
 * Stopped maintaining Qt 4 buildability

--- a/4
+++ b/4
@@ -16,7 +16,7 @@ node('CLIENT') {
        sh '''rm -rf build
 		mkdir build
 		cd build
-		cmake -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 -DWITH_TESTING=1 -DCMAKE_PREFIX_PATH=/var/lib/jenkins/qt/5.6.2 ..
+		cmake -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
 		make -j4
 		ctest -V --output-on-failure'''

@@ -24,7 +24,7 @@ node('CLIENT') {
        sh '''rm -rf build
 		mkdir build
 		cd build
-		cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DWITH_TESTING=1 -DCMAKE_PREFIX_PATH=/var/lib/jenkins/qt/5.6.2 ..
+		cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DWITH_TESTING=1 -DBUILD_WITH_QT4=OFF ..
 		make -j4
 		ctest -V --output-on-failure'''

--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -5,7 +5,7 @@ set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -50,39 +50,6 @@ X-GNOME-Autostart-Delay=3
 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,15 +8,22 @@ if(NOT TOKEN_AUTH_ONLY)
    find_package(Qt5Keychain REQUIRED)
 endif()

-if(NOT WIN32)
-  if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)"))
-    if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
-    else()
+if(WIN32)
+  # Enable DEP & ASLR
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+elseif(UNIX AND NOT APPLE)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+    else()
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
    endif()
+  else()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
  endif()

  string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
@@ -24,13 +31,7 @@ if(NOT WIN32)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
  endif()
-endif()

-if(WIN32)
-  # Enable DEP & ASLR
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
-elseif(UNIX AND NOT APPLE)
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
 endif()
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -344,7 +344,6 @@ void SqlQuery::bindValue(int pos, const QVariant &value)
        break;
    case QVariant::UInt:
    case QVariant::LongLong:
-    case QVariant::ULongLong:
        res = sqlite3_bind_int64(_stmt, pos, value.toLongLong());
        break;
    case QVariant::DateTime: {
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -45,7 +45,7 @@ Q_LOGGING_CATEGORY(lcDb, "sync.database", QtInfoMsg)
 static void fillFileRecordFromGetQuery(SyncJournalFileRecord &rec, SqlQuery &query)
 {
    rec._path = query.baValue(0);
-    rec._inode = query.int64Value(1);
+    rec._inode = query.intValue(1);
    rec._modtime = query.int64Value(2);
    rec._type = query.intValue(3);
    rec._etag = query.baValue(4);
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -211,14 +211,14 @@ static int _csync_treewalk_visitor(csync_file_stat_t *cur, CSYNC * ctx) {

    if (other_file_it == other_tree->cend()) {
        /* Check the renamed path as well. */
-        QByteArray renamed_path = csync_rename_adjust_parent_path(ctx, cur->path);
+        QByteArray renamed_path = csync_rename_adjust_path(ctx, cur->path);
        if (renamed_path != cur->path)
            other_file_it = other_tree->find(renamed_path);
    }

    if (other_file_it == other_tree->cend()) {
        /* Check the source path as well. */
-        QByteArray renamed_path = csync_rename_adjust_parent_path_source(ctx, cur->path);
+        QByteArray renamed_path = csync_rename_adjust_path_source(ctx, cur->path);
        if (renamed_path != cur->path)
            other_file_it = other_tree->find(renamed_path);
    }
@@ -314,9 +314,6 @@ int csync_s::reinitialize() {
  local.files.clear();
  remote.files.clear();

-  renames.folder_renamed_from.clear();
-  renames.folder_renamed_to.clear();
-
  status = CSYNC_STATUS_INIT;
  SAFE_FREE(error_string);

--- a/src/csync/csync_reconcile.cpp
+++ b/src/csync/csync_reconcile.cpp
@@ -113,7 +113,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {

    if (!other) {
        /* Check the renamed path as well. */
-        other = other_tree->findFile(csync_rename_adjust_parent_path(ctx, cur->path));
+        other = other_tree->findFile(csync_rename_adjust_path(ctx, cur->path));
    }
    if (!other) {
        /* Check if it is ignored */
@@ -147,25 +147,24 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
            cur->instruction = CSYNC_INSTRUCTION_NEW;

            bool processedRename = false;
-            auto renameCandidateProcessing = [&](const QByteArray &basePath) {
+            auto renameCandidateProcessing = [&](const OCC::SyncJournalFileRecord &base) {
                if (processedRename)
                    return;
-                if (basePath.isEmpty())
+                if (!base.isValid())
                    return;

                /* First, check that the file is NOT in our tree (another file with the same name was added) */
-                if (our_tree->findFile(basePath)) {
-                    other = nullptr;
-                    qCDebug(lcReconcile, "Origin found in our tree : %s", basePath.constData());
+                if (our_tree->findFile(base._path)) {
+                    qCDebug(lcReconcile, "Origin found in our tree : %s", base._path.constData());
                } else {
                    /* Find the potential rename source file in the other tree.
                    * If the renamed file could not be found in the opposite tree, that is because it
                    * is not longer existing there, maybe because it was renamed or deleted.
                    * The journal is cleaned up later after propagation.
                    */
-                    other = other_tree->findFile(basePath);
+                    other = other_tree->findFile(base._path);
                    qCDebug(lcReconcile, "Rename origin in other tree (%s) %s",
-                        basePath.constData(), other ? "found" : "not found");
+                        base._path.constData(), other ? "found" : "not found");
                }

                if(!other) {
@@ -198,7 +197,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                    // We have consumed 'other': exit this loop to not consume another one.
                    processedRename = true;
-                } else if (our_tree->findFile(csync_rename_adjust_parent_path(ctx, other->path)) == cur) {
+                } else if (our_tree->findFile(csync_rename_adjust_path(ctx, other->path)) == cur) {
                    // If we're here, that means that the other side's reconcile will be able
                    // to work against cur: The filename itself didn't change, only a parent
                    // directory was renamed! In that case it's safe to ignore the rename
@@ -226,34 +225,12 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                qCDebug(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
                    cur->inode);
                ctx->statedb->getFileRecordByInode(cur->inode, &base);
-                renameCandidateProcessing(base._path);
+                renameCandidateProcessing(base);
            } else {
                ASSERT(ctx->current == REMOTE_REPLICA);
-
-                // The update phase has already mapped out all dir->dir renames, check the
-                // path that is consistent with that first. Otherwise update mappings and
-                // reconcile mappings might disagree, leading to odd situations down the
-                // line.
-                auto basePath = csync_rename_adjust_full_path_source(ctx, cur->path);
-                if (basePath != cur->path) {
-                    qCDebug(lcReconcile, "Trying rename origin by csync_rename mapping %s",
-                        basePath.constData());
-                    // We go through getFileRecordsByFileId to ensure the basePath
-                    // computed in this way also has the expected fileid.
-                    ctx->statedb->getFileRecordsByFileId(cur->file_id,
-                        [&](const OCC::SyncJournalFileRecord &base) {
-                            if (base._path == basePath)
-                                renameCandidateProcessing(basePath);
-                        });
-                }
-
-                // Also feed all the other files with the same fileid if necessary
-                if (!processedRename) {
-                    qCDebug(lcReconcile, "Finding rename origin through file ID %s",
-                        cur->file_id.constData());
-                    ctx->statedb->getFileRecordsByFileId(cur->file_id,
-                        [&](const OCC::SyncJournalFileRecord &base) { renameCandidateProcessing(base._path); });
-                }
+                qCDebug(lcReconcile, "Finding rename origin through file ID %s",
+                    cur->file_id.constData());
+                ctx->statedb->getFileRecordsByFileId(cur->file_id, renameCandidateProcessing);
            }

            break;
--- a/src/csync/csync_rename.cpp
+++ b/src/csync/csync_rename.cpp
@@ -36,7 +36,7 @@ void csync_rename_record(CSYNC* ctx, const QByteArray &from, const QByteArray &t
    ctx->renames.folder_renamed_from[to] = from;
 }

-QByteArray csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path)
+QByteArray csync_rename_adjust_path(CSYNC* ctx, const QByteArray &path)
 {
    if (ctx->renames.folder_renamed_to.empty())
        return path;
@@ -50,25 +50,11 @@ QByteArray csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path)
    return path;
 }

-QByteArray csync_rename_adjust_parent_path_source(CSYNC *ctx, const QByteArray &path)
+QByteArray csync_rename_adjust_path_source(CSYNC* ctx, const QByteArray &path)
 {
    if (ctx->renames.folder_renamed_from.empty())
        return path;
-    for (ByteArrayRef p = _parentDir(path); !p.isEmpty(); p = _parentDir(p)) {
-        auto it = ctx->renames.folder_renamed_from.find(p);
-        if (it != ctx->renames.folder_renamed_from.end()) {
-            QByteArray rep = it->second + path.mid(p.length());
-            return rep;
-        }
-    }
-    return path;
-}
-
-QByteArray csync_rename_adjust_full_path_source(CSYNC *ctx, const QByteArray &path)
-{
-    if (ctx->renames.folder_renamed_from.empty())
-        return path;
-    for (ByteArrayRef p = path; !p.isEmpty(); p = _parentDir(p)) {
+    for (auto p = _parentDir(path); !p.isEmpty(); p = _parentDir(p)) {
        auto it = ctx->renames.folder_renamed_from.find(p);
        if (it != ctx->renames.folder_renamed_from.end()) {
            QByteArray rep = it->second + path.mid(p.length());
--- a/src/csync/csync_rename.h
+++ b/src/csync/csync_rename.h
@@ -22,19 +22,10 @@

 #include "csync.h"

-/* Return the final destination path of a given patch in case of renames
- *
- * Does only map the parent directories. If the directory "A" is renamed to
- * "B" then this function will not map "A" to "B". Only "A/foo" -> "B/foo".
-*/
-QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path(CSYNC *ctx, const QByteArray &path);
-
+/* Return the final destination path of a given patch in case of renames */
+QByteArray OCSYNC_EXPORT csync_rename_adjust_path(CSYNC *ctx, const QByteArray &path);
 /* Return the source of a given path in case of renames */
-QByteArray OCSYNC_EXPORT csync_rename_adjust_parent_path_source(CSYNC *ctx, const QByteArray &path);
-
-/* like the parent_path variant, but applying to the full path */
-QByteArray OCSYNC_EXPORT csync_rename_adjust_full_path_source(CSYNC *ctx, const QByteArray &path);
-
+QByteArray OCSYNC_EXPORT csync_rename_adjust_path_source(CSYNC *ctx, const QByteArray &path);
 void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const QByteArray &from, const QByteArray &to);
 /*  Return the amount of renamed item recorded */
 bool OCSYNC_EXPORT csync_rename_count(CSYNC *ctx);
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -429,13 +429,14 @@ void ActivityWidget::slotNotifyServerFinished(const QString &reply, int replyCod
    }

    endNotificationRequest(job->widget(), replyCode);
+    // FIXME: remove the  widget after a couple of seconds
    qCInfo(lcActivity) << "Server Notification reply code" << replyCode << reply;

    // if the notification was successful start a timer that triggers
    // removal of the done widgets in a few seconds
    // Add 200 millisecs to the predefined value to make sure that the timer in
    // widget's method readyToClose() has elapsed.
-    if (replyCode == OCS_SUCCESS_STATUS_CODE || replyCode == OCS_SUCCESS_STATUS_CODE_V2) {
+    if (replyCode == OCS_SUCCESS_STATUS_CODE) {
        scheduleWidgetToRemove(job->widget());
    }
 }
--- a/src/gui/notificationwidget.cpp
+++ b/src/gui/notificationwidget.cpp
@@ -128,8 +128,8 @@ void NotificationWidget::slotNotificationRequestFinished(int statusCode)

    QString timeStr = locale.toString(QTime::currentTime());

-    // the ocs API returns stat code 100 or 200 inside the xml if it succeeded.
-    if (statusCode != OCS_SUCCESS_STATUS_CODE && statusCode != OCS_SUCCESS_STATUS_CODE_V2) {
+    // the ocs API returns stat code 100 if it succeeded.
+    if (statusCode != OCS_SUCCESS_STATUS_CODE) {
        qCWarning(lcNotifications) << "Notification Request to Server failed, leave button visible.";
        for (i = 0; i < _buttons.count(); i++) {
            _buttons.at(i)->setEnabled(true);
--- a/src/gui/ocsjob.cpp
+++ b/src/gui/ocsjob.cpp
@@ -28,7 +28,6 @@ OcsJob::OcsJob(AccountPtr account)
    : AbstractNetworkJob(account, "")
 {
    _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE);
-    _passStatusCodes.append(OCS_SUCCESS_STATUS_CODE_V2);
    setIgnoreCredentialFailure(true);
 }

--- a/src/gui/ocsjob.h
+++ b/src/gui/ocsjob.h
@@ -24,8 +24,6 @@
 #include <QUrl>

 #define OCS_SUCCESS_STATUS_CODE 100
-// Apparantly the v2.php URLs can return that
-#define OCS_SUCCESS_STATUS_CODE_V2 200

 class QJsonDocument;

--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -24,8 +24,6 @@ namespace OCC {

 Q_LOGGING_CATEGORY(lcServerNotification, "gui.servernotification", QtInfoMsg)

-const QString notificationsPath = QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications");
-
 ServerNotificationHandler::ServerNotificationHandler(QObject *parent)
    : QObject(parent)
 {
@@ -49,7 +47,7 @@ void ServerNotificationHandler::slotFetchNotifications(AccountState *ptr)
    }

    // if the previous notification job has finished, start next.
-    _notificationJob = new JsonApiJob(ptr->account(), notificationsPath, this);
+    _notificationJob = new JsonApiJob(ptr->account(), QLatin1String("ocs/v2.php/apps/notifications/api/v1/notifications"), this);
    QObject::connect(_notificationJob.data(), &JsonApiJob::jsonReceived,
        this, &ServerNotificationHandler::slotNotificationsReceived);
    _notificationJob->setProperty("AccountStatePtr", QVariant::fromValue<AccountState *>(ptr));
@@ -96,16 +94,6 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j

            a._links.append(al);
        }
-
-        // Add another action to dismiss notification on server
-        // https://github.com/owncloud/notifications/blob/master/docs/ocs-endpoint-v1.md#deleting-a-notification-for-a-user
-        ActivityLink al;
-        al._label = tr("Dismiss");
-        al._link  = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + json.value("notification_id").toString()).toString();
-        al._verb  = "DELETE";
-        al._isPrimary = false;
-        a._links.append(al);
-
        list.append(a);
    }
    emit newNotificationList(list);
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -75,7 +75,7 @@ bool DiscoveryJob::isInSelectiveSyncBlackList(const QByteArray &path) const

    // Also try to adjust the path if there was renames
    if (csync_rename_count(_csync_ctx)) {
-        QByteArray adjusted = csync_rename_adjust_parent_path_source(_csync_ctx, path);
+        QByteArray adjusted = csync_rename_adjust_path_source(_csync_ctx, path);
        if (adjusted != path) {
            return findPathInList(_selectiveSyncBlackList, QString::fromUtf8(adjusted));
        }
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -50,9 +50,7 @@ private slots:
        QVERIFY(!record.isValid());

        record._path = "foo";
-        // Use a value that exceeds uint32 and isn't representable by the
-        // signed int being cast to uint64 either (like uint64::max would be)
-        record._inode = std::numeric_limits<quint32>::max() + 12ull;
+        record._inode = 1234;
        record._modtime = dropMsecs(QDateTime::currentDateTime());
        record._type = 5;
        record._etag = "789789";
@@ -73,9 +71,8 @@ private slots:
        QVERIFY(storedRecord == record);

        // Update metadata
+        record._inode = 12345;
        record._modtime = dropMsecs(QDateTime::currentDateTime().addDays(1));
-        // try a value that only fits uint64, not int64
-        record._inode = std::numeric_limits<quint64>::max() - std::numeric_limits<quint32>::max() - 1;
        record._type = 7;
        record._etag = "789FFF";
        record._fileId = "efg";
--- a/test/testsyncmove.cpp
+++ b/test/testsyncmove.cpp
@@ -231,25 +231,12 @@ private slots:
        QCOMPARE(fakeFolder.currentLocalState(), remoteInfo);
    }

-    void testDuplicateFileId_data()
-    {
-        QTest::addColumn<QString>("prefix");
-
-        // There have been bugs related to how the original
-        // folder and the folder with the duplicate tree are
-        // ordered. Test both cases here.
-        QTest::newRow("first ordering") << "O"; // "O" > "A"
-        QTest::newRow("second ordering") << "0"; // "0" < "A"
-    }
-
    // If the same folder is shared in two different ways with the same
    // user, the target user will see duplicate file ids. We need to make
    // sure the move detection and sync still do the right thing in that
    // case.
    void testDuplicateFileId()
    {
-        QFETCH(QString, prefix);
-
        FakeFolder fakeFolder{ FileInfo::A12_B12_C12_S12() };
        auto &remote = fakeFolder.remoteModifier();

@@ -258,8 +245,8 @@ private slots:
        remote.mkdir("A/Q");

        // Duplicate every entry in A under O/A
-        remote.mkdir(prefix);
-        remote.children[prefix].addChild(remote.children["A"]);
+        remote.mkdir("O");
+        remote.children["O"].addChild(remote.children["A"]);

        // This already checks that the rename detection doesn't get
        // horribly confused if we add new files that have the same
@@ -276,28 +263,28 @@ private slots:

        // Try a remote file move
        remote.rename("A/a1", "A/W/a1m");
-        remote.rename(prefix + "/A/a1", prefix + "/A/W/a1m");
+        remote.rename("O/A/a1", "O/A/W/a1m");
        QVERIFY(fakeFolder.syncOnce());
        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
        QCOMPARE(nGET, 0);

        // And a remote directory move
        remote.rename("A/W", "A/Q/W");
-        remote.rename(prefix + "/A/W", prefix + "/A/Q/W");
+        remote.rename("O/A/W", "O/A/Q/W");
        QVERIFY(fakeFolder.syncOnce());
        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
        QCOMPARE(nGET, 0);

        // Partial file removal (in practice, A/a2 may be moved to O/a2, but we don't care)
-        remote.rename(prefix + "/A/a2", prefix + "/a2");
+        remote.rename("O/A/a2", "O/a2");
        remote.remove("A/a2");
        QVERIFY(fakeFolder.syncOnce());
        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
        QCOMPARE(nGET, 0);

        // Local change plus remote move at the same time
-        fakeFolder.localModifier().appendByte(prefix + "/a2");
-        remote.rename(prefix + "/a2", prefix + "/a3");
+        fakeFolder.localModifier().appendByte("O/a2");
+        remote.rename("O/a2", "O/a3");
        QVERIFY(fakeFolder.syncOnce());
        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
        QCOMPARE(nGET, 1);
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Activitat del servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocol de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>No sincronitzat</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>No sincronitzat (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>La llista de l&apos;activitat del servidor s&apos;ha copiat al porta-retalls.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>La llista d&apos;activitat de sincronització s&apos;ha copiat al porta-retalls</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>S&apos;ha copiat una llista d&apos;elements no sincronitzats al porta-retalls.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>S&apos;ha copiat al porta-retalls</translation>
    </message>
@@ -2497,14 +2497,6 @@ No és aconsellada usar-la.</translation>
        <translation>S&apos;ha produit un error en carregar la llista de subcarpetes.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2874,12 +2866,12 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Error d&apos;accés</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Cal identificar-se com a usuari %1</translation>
    </message>
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Aktivita serveru</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protokol synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Nesesynchronizováno</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Nesesynchronizováno (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Výpis aktivity serveru byl zkopírován do schránky.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Výpis aktivity synchronizace byl zkopírován do schránky.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Seznam nesynchronizovaných položek byl zkopírován do schránky.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Zkopírováno do schránky</translation>
    </message>
@@ -2500,14 +2500,6 @@ Nedoporučuje se jí používat.</translation>
        <translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Zamítnout</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2877,12 +2869,12 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Chyba přihlášení</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Musíte se přihlásit jako uživatel %1</translation>
    </message>
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Serveraktivität</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Synchronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>nicht synchronisiert</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>nicht synchronisiert (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Die Server-Aktivitätsliste wurde in die Zwischenablage  kopiert. </translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Die Synchronisationsliste wurde in die Zwischenablage kopiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>In die Zwischenablage kopiert</translation>
    </message>
@@ -2501,14 +2501,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Ausblenden</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2878,12 +2870,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Log-In Fehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Sie müssen sich als %1 einloggen</translation>
    </message>
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Δραστηριότητα διακομιστή</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Προτοκολο συγχρονισμου</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Δεν είναι συγχρονισμένα</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Δεν είναι συγχρονισμένα (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Ο κατάλογος δραστηριοτήτων του διακομιστή έχει αντιγραφθεί στο Πρόχειρο</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Ο κατάλογος της δραστηριότητας συγχρονισμού έχει αντιγραφθεί στο Πρόχειρο</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Η λίστα των μη συγχρονισμένων αντικειμένων έχει αντιγραφεί στο πρόχειρο</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Αντιγράφηκε στο πρόχειρο</translation>
    </message>
@@ -2502,14 +2502,6 @@ It is not advisable to use it.</source>
        <translation>Παρουσιάστηκε σφάλμα κατά την φόρτωση της λίστας των υπο-φακέλων</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Απόρριψη</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2879,12 +2871,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Σφάλμα Σύνδεσης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Πρέπει να εισέλθετε σαν χρήστης %1</translation>
    </message>
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -414,44 +414,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2521,14 +2521,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2898,12 +2890,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Actividad del servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocolo de Sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>No sincronizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>No Sincronizado (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>La lista de la actividad del servidor se ha copiado en el portapapeles.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>La lista de actividades de sincronización se ha copiado en el portapapeles.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>La lista de elementos sin sincronizar, ha sido copiada al portapapeles.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiado al portapapeles</translation>
    </message>
@@ -2501,14 +2501,6 @@ No se recomienda usarla.</translation>
        <translation>Ha ocurrido un error mientras cargaba la lista de carpetas.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Descartar</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2878,12 +2870,12 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Error al iniciar sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Debe iniciar sesión como el usuario %1</translation>
    </message>
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Actividad de Servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocolo de Sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>No Sincronizado </translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>No Sincronizado (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiado al portapapeles</translation>
    </message>
@@ -2489,14 +2489,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2866,12 +2858,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Serveri aktiivsus</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Sünkroniseerimisprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Pole sünkroonitud</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Kopeeritud lõikepuhvrisse</translation>
    </message>
@@ -2490,14 +2490,6 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Jäta vahele</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2867,12 +2859,12 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Sisselogimise viga</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Pead sisse logima kui kasutaja %1</translation>
    </message>
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Zerbitzariaren Jarduera</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Sinkronizazio protokoloa</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Sinkronizatu gabekoak</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Arbelera kopiatua</translation>
    </message>
@@ -2492,14 +2492,6 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2869,12 +2861,12 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Errorea sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>فعالیت سرور</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>پروتکل همگام سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>کپی به کلیپ بورد</translation>
    </message>
@@ -2489,14 +2489,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>پنهان کن</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2866,12 +2858,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>خطای ورود</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Palvelimen toimet</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Ei synkronoitu</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Ei synkronoitu (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Kopioitu leikepöydälle</translation>
    </message>
@@ -2492,14 +2492,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Alikansioluetteloa ladatessa tapahtui virhe.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Hylkää</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2869,12 +2861,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Kirjautumisvirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Sinun tulee kirjautua käyttäjänä %1</translation>
    </message>
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Activité serveur</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Activité de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Fichiers non synchronisés</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Non Synchronisé (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>L&apos;historique des opérations sur le serveur a été copié dans le presse-papier.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>L&apos;historique des opérations locales a été copié dans le presse-papier.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>La liste des éléments non synchronisés a été copiée dans le presse-papier.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copié dans le presse-papier</translation>
    </message>
@@ -2503,14 +2503,6 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Ignorer</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2881,12 +2873,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Erreur de connexion</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Vous devez vous connecter en tant qu&apos;utilisateur %1</translation>
    </message>
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Actividade do servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocolo de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Non sincronizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Non sincronizado (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>A lista de actividade do servidor copiouse no portapapeis.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>A lista de actividade de sincronización foi copiada ao portapapeis.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>A lista de elementos non sincronizados foi copiada ao portapapeis.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiado no portapapeis.</translation>
    </message>
@@ -2491,14 +2491,6 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Desbotar</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2868,12 +2860,12 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Erro de acceso</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Ten que rexistrarse como usuario %1</translation>
    </message>
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Szerver aktivitás</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Szinkronizációs protokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Nincs szinkronizálva</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Nincs szinkronizálva (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>A szerver aktivitási lista a vágólapra másolva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>A szinkronizációs aktivitási lista a vágólapra másolva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Másolva a vágólapra</translation>
    </message>
@@ -2489,14 +2489,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Elutasít</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2866,12 +2858,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Bejelentkezési hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>%1 felhasználóként kell belépned</translation>
    </message>
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Attività del server</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocollo di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Non sincronizzata</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Non sincronizzata (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>L&apos;elenco di attività del server è stato copiato negli appunti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>L&apos;elenco di attività di sincronizzazione è stato copiato negli appunti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>L&apos;elenco di elementi non sincronizzati è stato copiato negli appunti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiato negli appunti</translation>
    </message>
@@ -2497,14 +2497,6 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Si è verificato un errore durante il caricamento dell&apos;elenco delle sottocartelle.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Annulla</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2874,12 +2866,12 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Errore di accesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Devi accedere con l&apos;utente %1</translation>
    </message>
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -243,7 +243,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="656"/>
        <source>Server %1 is currently in maintenance mode.</source>
-        <translation>サーバー %1 は現在メンテナンスモードです。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="658"/>
@@ -258,7 +258,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
        <source>Connecting to %1...</source>
-        <translation>%1 に接続中...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="674"/>
@@ -373,7 +373,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="132"/>
        <source>Maintenance mode</source>
-        <translation>メンテナンスモード</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="134"/>
@@ -388,7 +388,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="138"/>
        <source>Asking Credentials</source>
-        <translation>証明書を要求</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="140"/>
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>サーバーアクティビティ</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>同期状況</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>同期対象外</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>未同期 (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>サーバーアクティビティリストをクリップボードにコピーしました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>同期状況をクリップボードにコピーしました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>同期されていないアイテムのリストがクリップボードにコピーされました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>クリップボードにコピー</translation>
    </message>
@@ -988,7 +988,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
        <source>There are unresolved conflicts. Click for details.</source>
-        <translation>未解決の競合があります。クリックで詳細。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@@ -1396,7 +1396,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>課題一覧</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1448,7 +1448,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
-        <translation>課題</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2498,14 +2498,6 @@ It is not advisable to use it.</source>
        <translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>閉じる</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2875,12 +2867,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>ログインエラー</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>ユーザー %1 としてログインする必要があります</translation>
    </message>
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Server-aktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Synkroniseringsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Ikke synkronisert</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Ikke synkronisert (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Server-aktivitetslisten er kopiert til utklippstavlen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Synkroniserings-aktivitetslisten er kopiert til utklippstavlen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Listen med usynkroniserte elementer ble kopiert til utklippstavlen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Kopiert til utklippstavlen</translation>
    </message>
@@ -691,17 +691,17 @@
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="364"/>
        <source>%1 and %n other file(s) have been removed.</source>
-        <translation><numerusform>%1 og %n annen fil har blitt fjernet.</numerusform><numerusform>%1 og %n andre filer har blitt fjernet.</numerusform></translation>
+        <translation><numerusform>%1 og %2 annen fil har blitt fjernet.</numerusform><numerusform>%1 og %2 andre filer har blitt fjernet.</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="371"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
-        <translation><numerusform>%1 og %n annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %n andre filer har blitt lastet ned.</numerusform></translation>
+        <translation><numerusform>%1 og %2 annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %n andre filer har blitt lastet ned.</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="378"/>
        <source>%1 and %n other file(s) have been updated.</source>
-        <translation><numerusform>%1 og %n annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation>
+        <translation><numerusform>%1 og %2 annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="385"/>
@@ -1408,7 +1408,7 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
        <location filename="../src/gui/issueswidget.ui" line="42"/>
        <location filename="../src/gui/issueswidget.ui" line="61"/>
        <source>&lt;no filter&gt;</source>
-        <translation>&lt;no filter&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
@@ -2501,14 +2501,6 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Det oppstod en feil ved lasting av liten med undermapper.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Forkast</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2878,12 +2870,12 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Innloggingsfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Du må logge inn som bruker %1</translation>
    </message>
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Serveractiviteit</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Synchronisatiegeschiedenis</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Niet gesynchroniseerd</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Niet gesynchroniseerd (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>De server activiteitenlijst is gekopieerd naar het klembord.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>De sync activiteitenlijst is gekopieerd naar het klembord.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>De lijst met niet gesyncte objecten is gekopieerd naar het klembord.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Gekopieerd naar het klembord</translation>
    </message>
@@ -2506,14 +2506,6 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Terzijde leggen</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2883,12 +2875,12 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Inlogfout</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>U moet inloggen als gebruiker %1</translation>
    </message>
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -243,7 +243,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="656"/>
        <source>Server %1 is currently in maintenance mode.</source>
-        <translation>Serwer %1 jest obecnie w trybie konserwacji.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="658"/>
@@ -258,7 +258,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
        <source>Connecting to %1...</source>
-        <translation>Łączenie do %1...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="674"/>
@@ -373,7 +373,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="132"/>
        <source>Maintenance mode</source>
-        <translation>Tryb konserwacji</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="134"/>
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Aktywność serwera</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protokół synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Niezsynchronizowany</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Niezsynchronizowany (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Log aktywności serwera został skopiowany do schowka.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Przebieg synchronizacji został skopiowany do schowka.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Lista niezsynchronizowanych elementów została skopiowana do schowka</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Skopiuj do schowka</translation>
    </message>
@@ -768,10 +768,7 @@
 These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Wszystkie pliki z folderu &apos;%1&apos; zostały usunięte z serwera.
-W momencie synchronizacji zostaną usunięte z lokalnego katalogu, co spowoduje ich niedostępność, chyba, że posiadasz prawo do przywracania.
-Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie przesłane na serwer.
-Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@@ -2498,14 +2495,6 @@ Niezalecane jest jego użycie.</translation>
        <translation>Wystąpił błąd podczas wczytywania listy podfolderów</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Anuluj</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2875,12 +2864,12 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Błąd logowania</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Musisz zalogować się jako użytkownik %1</translation>
    </message>
@@ -3779,7 +3768,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="327"/>
        <source>Ask for confirmation before synchronizing e&amp;xternal storages</source>
-        <translation>Pytaj o potwierdzenie przed synchronizacją napędów zewnętrznych</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="351"/>
@@ -3845,12 +3834,12 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
        <source>An error occured while connecting. Please try again.</source>
-        <translation>Podczas połączenia wystąpił problem. Proszę spróbować ponownie. </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
        <source>Re-open Browser</source>
-        <translation>Otwórz przeglądarkę ponownie</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -4178,12 +4167,12 @@ Kliknij</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>Nie można otworzyć przeglądarki</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
        <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
-        <translation>Podczas uruchamiania przeglądarki aby przejść do adresu URL %1 wystąpił problem. Czy skonfigurowano domyślną przeglądarkę?</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="55"/>
@@ -4193,7 +4182,7 @@ Kliknij</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="56"/>
        <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
-        <translation>Podczas uruchamiania klienta poczty wystąpił problem. Czy skonfigurowano domyślnego klienta pocztowego?</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 </TS>
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Atividade do Servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocolo de Sincronização</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Não Sincronizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Não Sincronizado (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>A lista de atividades de sincronização foi copiada para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiado para a área de transferência</translation>
    </message>
@@ -2502,14 +2502,6 @@ Não é aconselhada a sua utilização.</translation>
        <translation>Ocorreu um erro ao carregar a lista das sub pastas.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Rejeitar</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2879,12 +2871,12 @@ Não é aconselhada a sua utilização.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Erro de login</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Deve fazer o login como utilizador %1.</translation>
    </message>
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Atividade do Servidor</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protocolo de Sincronização</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Não Sincronizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Não sincronizada (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>A lista de atividades do servidor tem sido copiados para o clipboard.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Copiado para área de transferência</translation>
    </message>
@@ -2499,14 +2499,6 @@ It is not advisable to use it.</source>
        <translation>Ocorreu um erro enquanto carregava a lista de subpastas.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Dispensar</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2876,12 +2868,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Erro de Login</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Você deve entrar como usuário %1</translation>
    </message>
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Действия Сервера</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Протокол синхронизации</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Не синхронизировано</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Не синхронизировано (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Список активности сервера скопирован в буфер обмена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Список активности синхронизации скопирован в буфер обмена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Список несинхронизированных элементов скопирован в буфер обмена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Скопировано в буфер обмена</translation>
    </message>
@@ -2499,14 +2499,6 @@ It is not advisable to use it.</source>
        <translation>Произошла ошибка во время загрузки списка подпапок.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Убрать</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2876,12 +2868,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Ошибка входа</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Вы должны войти как пользователь %1</translation>
    </message>
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Aktivita servera</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Záznam synchronizácie</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Nezosynchronizované</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Nezosynchronizované (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Zoznam aktivít servera bol skopírovaný do schránky.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Zoznam aktivít synchronizácie bol skopírovaný do schránky.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Skopírované do schránky</translation>
    </message>
@@ -2491,14 +2491,6 @@ Nie je vhodné ju používať.</translation>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Odmietnuť</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2868,12 +2860,12 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Chybné prihlásenie</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Musíte sa prihlásiť ako používateľ %1</translation>
    </message>
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Dejavnost strežnika</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Protokol usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Ni usklajeno</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Ni usklajeno (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Seznam opravil strežnika je kopiran v odložišče.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Seznam opravil usklajevanja je kopiran v odložišče.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Seznam neusklajenih predmetov je kopiran v odložišče.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Kopirano v odložišče</translation>
    </message>
@@ -2502,14 +2502,6 @@ Uporaba ni priporočljiva.</translation>
        <translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Opusti</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2879,12 +2871,12 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Napaka prijave</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Prijaviti se je treba kot uporabnik %1</translation>
    </message>
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Активност сервера</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Протокол синхронизације</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Несинхронизовано</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Копирано у клипборд</translation>
    </message>
@@ -2491,14 +2491,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Откажи</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2868,12 +2860,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Грешка пријављивања</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Морате се пријавити као %1</translation>
    </message>
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Serveraktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Synkprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Inte synkroniserad</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Inte synkad (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Listan på serveraktivitet har kopierats till urklipp.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Listan på synkaktivitet har kopierats till urklipp.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Listan över ej synkroniserat har kopierats till klippbordet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Kopierat till urklipp</translation>
    </message>
@@ -2497,14 +2497,6 @@ Det är inte lämpligt använda den.</translation>
        <translation>Ett fel uppstod när listan för submappar laddades.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Avfärda</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2874,12 +2866,12 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Login fel</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Du måste logga in som en användare %1</translation>
    </message>
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>กิจกรรมของเซิร์ฟเวอร์</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>ไม่ถูกประสานข้อมูลให้ตรงกัน</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>ไม่ถูกประสานข้อมูล (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>รายการกิจกรรมเซิร์ฟเวอร์ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>รายการกิจกรรมการประสานข้อมูลได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>รายชื่อของรายการที่ไม่ได้ประสานข้อมูล ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>คัดลอกไปยังคลิปบอร์ด</translation>
    </message>
@@ -2503,14 +2503,6 @@ It is not advisable to use it.</source>
        <translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>ยกเลิก</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2880,12 +2872,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>เข้าสู่ระบบผิดพลาด</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>คุณต้องเข้าสู่ระบบเป็นผู้ใช้ %1</translation>
    </message>
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Sunucu Etkinliği</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Eşitleme Protokolü</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Eşitlenmedi</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Eşitlenmedi (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Sunucu etkinlik listesi panoya kopyalandı.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>Eşitleme etkinlik listesi panoya kopyalandı.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>Eşitlenmemiş ögelerin listesi panoya kopyalandı.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Panoya kopyalandı</translation>
    </message>
@@ -2492,14 +2492,6 @@ Kullanmanız önerilmez.</translation>
        <translation>Alt klasör listesi alınırken bir hata oluştu.</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>İptal et</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2869,12 +2861,12 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Oturum Açma Hatası</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>%1 kullanıcısı olarak oturum açmalısınız</translation>
    </message>
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>Серверна активність</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>Протокол Синхронізації</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>Не синхронізовано</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>Not Synced (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>Список серверних операцій скопійовано до буферу обміну.</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>Скопійовано в буфер обміну</translation>
    </message>
@@ -2490,14 +2490,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>Припинити</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2867,12 +2859,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>Помилка входу</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>Ви маєте увійти як %1</translation>
    </message>
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>服务器动态</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>同步协议</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>未同步</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>未同步 (%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>服务器动态已被复制到剪贴板。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>同步动态已被复制到剪贴板。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>未同步列表已复制到剪贴板。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>复制到剪贴板</translation>
    </message>
@@ -2501,14 +2501,6 @@ It is not advisable to use it.</source>
        <translation>载入子文件夹列表时发生错误。</translation>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation>忽略</translation>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2878,12 +2870,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>登录错误</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>你必须以用户&apos;%1&apos;身份登录</translation>
    </message>
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -412,44 +412,44 @@
 <context>
    <name>OCC::ActivitySettings</name>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="515"/>
-        <location filename="../src/gui/activitywidget.cpp" line="563"/>
+        <location filename="../src/gui/activitywidget.cpp" line="516"/>
+        <location filename="../src/gui/activitywidget.cpp" line="564"/>
        <source>Server Activity</source>
        <translation>伺服器活動</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="522"/>
+        <location filename="../src/gui/activitywidget.cpp" line="523"/>
        <source>Sync Protocol</source>
        <translation>同步協定</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="571"/>
+        <location filename="../src/gui/activitywidget.cpp" line="572"/>
        <source>Not Synced</source>
        <translation>尚未同步</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="574"/>
+        <location filename="../src/gui/activitywidget.cpp" line="575"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
        <translation>未同步(%1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="606"/>
+        <location filename="../src/gui/activitywidget.cpp" line="607"/>
        <source>The server activity list has been copied to the clipboard.</source>
        <translation>伺服器活動列表已經被複製到剪貼簿。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="610"/>
+        <location filename="../src/gui/activitywidget.cpp" line="611"/>
        <source>The sync activity list has been copied to the clipboard.</source>
        <translation>同步活動列表已經被複製到剪貼簿。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="613"/>
+        <location filename="../src/gui/activitywidget.cpp" line="614"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
        <translation>未同步的清單已經被複製到剪貼簿。</translation>
    </message>
    <message>
-        <location filename="../src/gui/activitywidget.cpp" line="618"/>
+        <location filename="../src/gui/activitywidget.cpp" line="619"/>
        <source>Copied to clipboard</source>
        <translation>複製至剪貼簿中</translation>
    </message>
@@ -2493,14 +2493,6 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
 </context>
-<context>
-    <name>OCC::ServerNotificationHandler</name>
-    <message>
-        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
-        <source>Dismiss</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
 <context>
    <name>OCC::SettingsDialog</name>
    <message>
@@ -2870,12 +2862,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>Login Error</source>
        <translation>登入錯誤</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="234"/>
        <source>You must sign in as user %1</source>
        <translation>您必須以 %1 使用者登入</translation>
    </message>