Group requests to ensure balance between bandwidth utilization and bookkeeping #5391 #5390 #4498 #1633 #4454

2017-01-25 21:35:41 +01:00
@@ -41,7 +41,7 @@ endif (MEM_NULL_TESTS)
 add_subdirectory(src)

 if (UNIT_TESTING)
-    set(WITH_TESTING ON)
+    set(WITH_UNIT_TESTING ON)

    find_package(CMocka)
    if (CMOCKA_FOUND)
@@ -26,4 +26,4 @@
 #cmakedefine HAVE___MINGW_ASPRINTF 1
 #cmakedefine HAVE_ASPRINTF 1

-#cmakedefine WITH_TESTING 1
+#cmakedefine WITH_UNIT_TESTING 1
@@ -45,7 +45,7 @@
 #define CSYNC_LOG_CATEGORY_NAME "csync.exclude"
 #include "csync_log.h"

-#ifndef WITH_TESTING
+#ifndef WITH_UNIT_TESTING
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
@@ -36,7 +36,7 @@ enum csync_exclude_type_e {
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;

-#ifdef WITH_TESTING
+#ifdef WITH_UNIT_TESTING
 int OCSYNC_EXPORT _csync_exclude_add(c_strlist_t **inList, const char *string);
 #endif

@@ -89,7 +89,7 @@ struct csync_s {

      /* hooks for checking the white list (uses the update_callback_userdata) */
      int (*checkSelectiveSyncBlackListHook)(void*, const char*);
-      int (*checkSelectiveSyncNewFolderHook)(void*, const char* /* path */, const char* /* remotePerm */);
+      int (*checkSelectiveSyncNewFolderHook)(void*, const char*);


      csync_vio_opendir_hook remote_opendir_hook;
@@ -436,7 +436,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                st->instruction = CSYNC_INSTRUCTION_NEW;

                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
-                    if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path, fs->remotePerm)) {
+                    if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path)) {
                        csync_file_stat_free(st);
                        return 1;
                    }
@@ -50,21 +50,6 @@ Identifying Basic Functionality Problems
  As an example, after installing the ``cadaver`` app, you can issue the
  ``propget`` command to obtain various properties pertaining to the current
  directory and also verify WebDAV server connection.
-  
-"CSync unknown error"
---------------------
-
-If you see this error message stop your client, delete the
-``.csync_journal.db`` file, and then restart your client. 
-There is a  ``.csync_journal.db`` file inside the folder of every account
-configured on your client. 
-
-.. NOTE::
-   Please note that this will also erase some of your settings about which
-   files to download.
-   
-See https://github.com/owncloud/client/issues/5226 for more discussion of this
-issue.


 Isolating other issues
@@ -652,15 +652,6 @@ X-GNOME-Autostart-Delay=3
 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -196,8 +196,8 @@ void AccountManager::saveAccountHelper(Account* acc, QSettings& settings, bool s
    if (acc->_am) {
        CookieJar* jar = qobject_cast<CookieJar*>(acc->_am->cookieJar());
        if (jar) {
-            qDebug() << "Saving cookies." << acc->cookieJarPath();
-            jar->save(acc->cookieJarPath());
+            qDebug() << "Saving cookies.";
+            jar->save();
        }
    }
 }
@@ -289,8 +289,6 @@ void AccountManager::deleteAccount(AccountState* account)
    auto copy = *it; // keep a reference to the shared pointer so it does not delete it just yet
    _accounts.erase(it);

-    QFile::remove(account->account()->cookieJarPath());
-
    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
    settings->remove(account->account()->id());

@@ -675,13 +675,8 @@ void AccountSettings::refreshSelectiveSyncStatus()
        ui->selectiveSyncButtons->setVisible(true);
        ui->bigFolderUi->setVisible(false);
    } else {
-        ConfigFile cfg;
-        QString info =
-            !cfg.confirmExternalStorage() ? tr("There are folders that were not synchronized because they are too big: ") :
-            !cfg.newBigFolderSizeLimit().first ? tr("There are folders that were not synchronized because they are external storages: ") :
-            tr("There are folders that were not synchronized because they are too big or external storages: ");
-
-        ui->selectiveSyncNotification->setText(info + msg);
+        QString wholeMsg = tr("There are new folders that were not synchronized because they are too big: ") + msg;
+        ui->selectiveSyncNotification->setText(wholeMsg);
        ui->selectiveSyncButtons->setVisible(false);
        ui->bigFolderUi->setVisible(true);
        shouldBeVisible = true;
@@ -130,7 +130,7 @@ void ShibbolethCredentials::fetchFromKeychain()
        ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
        job->setSettings(Utility::settingsWithGroup(Theme::instance()->appName(), job).release());
        job->setInsecureFallback(false);
-        job->setKey(keychainKey(_account->url().toString(), user()));
+        job->setKey(keychainKey(_account->url().toString(), "shibAssertion"));
        connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadJobDone(QKeychain::Job*)));
        job->start();
    }
@@ -309,7 +309,7 @@ void ShibbolethCredentials::storeShibCookie(const QNetworkCookie &cookie)
    job->setSettings(Utility::settingsWithGroup(Theme::instance()->appName(), job).release());
    // we don't really care if it works...
    //connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotWriteJobDone(QKeychain::Job*)));
-    job->setKey(keychainKey(_account->url().toString(), user()));
+    job->setKey(keychainKey(_account->url().toString(), "shibAssertion"));
    job->setTextData(QString::fromUtf8(cookie.toRawForm()));
    job->start();
 }
@@ -318,7 +318,7 @@ void ShibbolethCredentials::removeShibCookie()
 {
    DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
    job->setSettings(Utility::settingsWithGroup(Theme::instance()->appName(), job).release());
-    job->setKey(keychainKey(_account->url().toString(), user()));
+    job->setKey(keychainKey(_account->url().toString(), "shibAssertion"));
    job->start();
 }

@@ -52,6 +52,7 @@ Folder::Folder(const FolderDefinition& definition,
    : QObject(parent)
      , _accountState(accountState)
      , _definition(definition)
+      , _csyncError(false)
      , _csyncUnavail(false)
      , _wipeDb(false)
      , _proxyDirty(true)
@@ -86,6 +87,8 @@ Folder::Folder(const FolderDefinition& definition,

    connect(_accountState.data(), SIGNAL(isConnectedChanged()), this, SIGNAL(canSyncChanged()));
    connect(_engine.data(), SIGNAL(rootEtag(QString)), this, SLOT(etagRetreivedFromSyncEngine(QString)));
+    connect(_engine.data(), SIGNAL(treeWalkResult(const SyncFileItemVector&)),
+              this, SLOT(slotThreadTreeWalkResult(const SyncFileItemVector&)), Qt::QueuedConnection);

    connect(_engine.data(), SIGNAL(started()),  SLOT(slotSyncStarted()), Qt::QueuedConnection);
    connect(_engine.data(), SIGNAL(finished(bool)), SLOT(slotSyncFinished(bool)), Qt::QueuedConnection);
@@ -99,10 +102,9 @@ Folder::Folder(const FolderDefinition& definition,
            SLOT(slotAboutToRestoreBackup(bool*)));
    connect(_engine.data(), SIGNAL(folderDiscovered(bool,QString)), this, SLOT(slotFolderDiscovered(bool,QString)));
    connect(_engine.data(), SIGNAL(transmissionProgress(ProgressInfo)), this, SLOT(slotTransmissionProgress(ProgressInfo)));
-    connect(_engine.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
-            this, SLOT(slotItemCompleted(const SyncFileItemPtr &)));
-    connect(_engine.data(), SIGNAL(newBigFolder(QString,bool)),
-            this, SLOT(slotNewBigFolderDiscovered(QString,bool)));
+    connect(_engine.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
+    connect(_engine.data(), SIGNAL(newBigFolder(QString)), this, SLOT(slotNewBigFolderDiscovered(QString)));
    connect(_engine.data(), SIGNAL(seenLockedFile(QString)), FolderMan::instance(), SLOT(slotSyncOnceFileUnlocks(QString)));
    connect(_engine.data(), SIGNAL(aboutToPropagate(SyncFileItemVector&)),
            SLOT(slotLogPropagationStart()));
@@ -136,13 +138,13 @@ void Folder::checkLocalPath()
    } else {
        // Check directory again
        if( !FileSystem::fileExists(_definition.localPath, fi) ) {
-            _syncResult.appendErrorString(tr("Local folder %1 does not exist.").arg(_definition.localPath));
+            _syncResult.setErrorString(tr("Local folder %1 does not exist.").arg(_definition.localPath));
            _syncResult.setStatus( SyncResult::SetupError );
        } else if( !fi.isDir() ) {
-            _syncResult.appendErrorString(tr("%1 should be a folder but is not.").arg(_definition.localPath));
+            _syncResult.setErrorString(tr("%1 should be a folder but is not.").arg(_definition.localPath));
            _syncResult.setStatus( SyncResult::SetupError );
        } else if( !fi.isReadable() ) {
-            _syncResult.appendErrorString(tr("%1 is not readable.").arg(_definition.localPath));
+            _syncResult.setErrorString(tr("%1 is not readable.").arg(_definition.localPath));
            _syncResult.setStatus( SyncResult::SetupError );
        }
    }
@@ -265,8 +267,8 @@ SyncResult Folder::syncResult() const

 void Folder::prepareToSync()
 {
-    _syncResult.reset();
    _syncResult.setStatus( SyncResult::NotYetStarted );
+    _syncResult.clearErrors();
 }

 void Folder::slotRunEtagJob()
@@ -320,33 +322,120 @@ void Folder::etagRetreivedFromSyncEngine(const QString& etag)
 }


-void Folder::showSyncResultPopup()
+void Folder::bubbleUpSyncResult()
 {
-    if( _syncResult.firstItemNew() ) {
-        createGuiLog( _syncResult.firstItemNew()->_file, LogStatusNew, _syncResult.numNewItems() );
-    }
-    if( _syncResult.firstItemDeleted() ) {
-        createGuiLog( _syncResult.firstItemDeleted()->_file, LogStatusRemove, _syncResult.numRemovedItems() );
-    }
-    if( _syncResult.firstItemUpdated() ) {
-        createGuiLog( _syncResult.firstItemUpdated()->_file, LogStatusUpdated, _syncResult.numUpdatedItems() );
+    // count new, removed and updated items
+    int newItems = 0;
+    int removedItems = 0;
+    int updatedItems = 0;
+    int ignoredItems = 0;
+    int renamedItems = 0;
+    int conflictItems = 0;
+    int errorItems = 0;
+
+    SyncFileItemPtr firstItemNew;
+    SyncFileItemPtr firstItemDeleted;
+    SyncFileItemPtr firstItemUpdated;
+    SyncFileItemPtr firstItemRenamed;
+    SyncFileItemPtr firstConflictItem;
+    SyncFileItemPtr firstItemError;
+
+    QElapsedTimer timer;
+    timer.start();
+
+    foreach (const SyncFileItemPtr &item, _syncResult.syncFileItemVector() ) {
+        // Process the item to the gui
+        if( item->_status == SyncFileItem::FatalError || item->_status == SyncFileItem::NormalError ) {
+            //: this displays an error string (%2) for a file %1
+            slotSyncError( tr("%1: %2").arg(item->_file, item->_errorString) );
+            errorItems++;
+            if (!firstItemError) {
+                firstItemError = item;
+            }
+        } else if( item->_status == SyncFileItem::FileIgnored ) {
+            // ignored files don't show up in notifications
+            continue;
+        } else if( item->_status == SyncFileItem::Conflict ) {
+            conflictItems++;
+            if (!firstConflictItem) {
+                firstConflictItem = item;
+            }
+        } else {
+            // add new directories or remove gone away dirs to the watcher
+            if (item->_isDirectory && item->_instruction == CSYNC_INSTRUCTION_NEW ) {
+                FolderMan::instance()->addMonitorPath( alias(), path()+item->_file );
+            }
+            if (item->_isDirectory && item->_instruction == CSYNC_INSTRUCTION_REMOVE ) {
+                FolderMan::instance()->removeMonitorPath( alias(), path()+item->_file );
+            }
+
+            if (!item->hasErrorStatus() && item->_direction == SyncFileItem::Down) {
+                switch (item->_instruction) {
+                case CSYNC_INSTRUCTION_NEW:
+                case CSYNC_INSTRUCTION_TYPE_CHANGE:
+                    newItems++;
+                    if (!firstItemNew)
+                        firstItemNew = item;
+                    break;
+                case CSYNC_INSTRUCTION_REMOVE:
+                    removedItems++;
+                    if (!firstItemDeleted)
+                        firstItemDeleted = item;
+                    break;
+                case CSYNC_INSTRUCTION_SYNC:
+                    updatedItems++;
+                    if (!firstItemUpdated)
+                        firstItemUpdated = item;
+                    break;
+                case CSYNC_INSTRUCTION_ERROR:
+                    qDebug() << "Got Instruction ERROR. " << _syncResult.errorString();
+                    break;
+                case CSYNC_INSTRUCTION_RENAME:
+                    if (!firstItemRenamed) {
+                        firstItemRenamed = item;
+                    }
+                    renamedItems++;
+                    break;
+                default:
+                    // nothing.
+                    break;
+                }
+            } else if( item->_direction == SyncFileItem::None ) { // ignored files counting.
+                if( item->_instruction == CSYNC_INSTRUCTION_IGNORE ) {
+                    ignoredItems++;
+                }
+            }
+        }
    }

-    if( _syncResult.firstItemRenamed() ) {
+    qDebug() << "Processing result list and logging took " << timer.elapsed() << " Milliseconds.";
+    _syncResult.setWarnCount(ignoredItems);
+
+    if( firstItemNew ) {
+        createGuiLog( firstItemNew->_file, LogStatusNew, newItems );
+    }
+    if( firstItemDeleted ) {
+        createGuiLog( firstItemDeleted->_file, LogStatusRemove, removedItems );
+    }
+    if( firstItemUpdated ) {
+        createGuiLog( firstItemUpdated->_file, LogStatusUpdated, updatedItems );
+    }
+
+    if( firstItemRenamed ) {
        LogStatus status(LogStatusRename);
        // if the path changes it's rather a move
-        QDir renTarget = QFileInfo(_syncResult.firstItemRenamed()->_renameTarget).dir();
-        QDir renSource = QFileInfo(_syncResult.firstItemRenamed()->_file).dir();
+        QDir renTarget = QFileInfo(firstItemRenamed->_renameTarget).dir();
+        QDir renSource = QFileInfo(firstItemRenamed->_file).dir();
        if(renTarget != renSource) {
            status = LogStatusMove;
        }
-        createGuiLog( _syncResult.firstItemRenamed()->_originalFile, status, _syncResult.numRenamedItems(), _syncResult.firstItemRenamed()->_renameTarget );
+        createGuiLog( firstItemRenamed->_originalFile, status, renamedItems, firstItemRenamed->_renameTarget );
    }

-    if( _syncResult.firstConflictItem() ) {
-        createGuiLog( _syncResult.firstConflictItem()->_file, LogStatusConflict, _syncResult.numConflictItems() );
+    if( firstConflictItem ) {
+        createGuiLog( firstConflictItem->_file, LogStatusConflict, conflictItems );
    }
-    createGuiLog( _syncResult.firstItemError()->_file, LogStatusError, _syncResult.numErrorItems() );
+    createGuiLog( firstItemError->_file, LogStatusError, errorItems );

    qDebug() << "OO folder slotSyncFinished: result: " << int(_syncResult.status());
 }
@@ -485,6 +574,12 @@ void Folder::slotWatchedPathChanged(const QString& path)
    scheduleThisFolderSoon();
 }

+void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
+{
+    _syncResult.setSyncFileItemVector(items);
+}
+
+
 void Folder::saveToSettings() const
 {
    // Remove first to make sure we don't get duplicates
@@ -547,6 +642,9 @@ void Folder::slotTerminateSync()
    if( _engine->isSyncRunning() ) {
        _engine->abort();

+        // Do not display an error message, user knows his own actions.
+        // _errors.append( tr("The CSync thread terminated.") );
+        // _csyncError = true;
        setSyncState(SyncResult::SyncAbortRequested);
    }
 }
@@ -594,9 +692,10 @@ bool Folder::setIgnoredFiles()
    // a QSet of files to load.
    ConfigFile cfg;
    QString systemList = cfg.excludeFile(ConfigFile::SystemScope);
-    qDebug() << "==== adding system ignore list to csync:" << systemList;
-    _engine->excludedFiles().addExcludeFilePath(systemList);
-
+    if( QFile::exists(systemList) ) {
+        qDebug() << "==== adding system ignore list to csync:" << systemList;
+        _engine->excludedFiles().addExcludeFilePath(systemList);
+    }
    QString userList = cfg.excludeFile(ConfigFile::UserScope);
    if( QFile::exists(userList) ) {
        qDebug() << "==== adding user defined ignore list to csync:" << userList;
@@ -627,17 +726,19 @@ void Folder::startSync(const QStringList &pathList)
        qCritical() << "* ERROR csync is still running and new sync requested.";
        return;
    }
+    _errors.clear();
+    _csyncError = false;
    _csyncUnavail = false;

    _timeSinceLastSyncStart.restart();
+    _syncResult.clearErrors();
    _syncResult.setStatus( SyncResult::SyncPrepare );
+    _syncResult.setSyncFileItemVector(SyncFileItemVector());
    emit syncStateChange();

    qDebug() << "*** Start syncing " << remoteUrl().toString() << " - client version"
             << qPrintable(Theme::instance()->version());

-    _fileLog->start(path());
-
    if (!setIgnoredFiles())
    {
        slotSyncError(tr("Could not read system exclude file"));
@@ -647,15 +748,15 @@ void Folder::startSync(const QStringList &pathList)

    setDirtyNetworkLimits();

-    SyncOptions opt;
    ConfigFile cfgFile;
    auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
-    opt._newBigFolderSizeLimit = newFolderLimit.first ? newFolderLimit.second * 1000LL * 1000LL : -1; // convert from MB to B
-    opt._confirmExternalStorage = cfgFile.confirmExternalStorage();
-    _engine->setSyncOptions(opt);
+    quint64 limit = newFolderLimit.first ? newFolderLimit.second * 1000 * 1000 : -1; // convert from MB to B
+    _engine->setNewBigFolderSizeLimit(limit);

    _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);

+    _fileLog->start(path());
+
    QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);

    emit syncStarted();
@@ -686,7 +787,8 @@ void Folder::setDirtyNetworkLimits()

 void Folder::slotSyncError(const QString& err)
 {
-    _syncResult.appendErrorString(err);
+    _errors.append( err );
+    _csyncError = true;
 }

 void Folder::slotSyncStarted()
@@ -708,26 +810,29 @@ void Folder::slotSyncFinished(bool success)
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
              <<  " SSL " <<  QSslSocket::sslLibraryVersionString().toUtf8().data()
 #endif
-    ;
+   ;

-    bool syncError = !_syncResult.errorStrings().isEmpty();
-    if( syncError ) {
-        qDebug() << "-> SyncEngine finished with ERROR";
+
+    if( _csyncError ) {
+        qDebug() << "-> SyncEngine finished with ERROR, warn count is" << _syncResult.warnCount();
    } else {
        qDebug() << "-> SyncEngine finished without problem.";
    }
    _fileLog->finish();
-    showSyncResultPopup();
+    bubbleUpSyncResult();

    auto anotherSyncNeeded = _engine->isAnotherSyncNeeded();

-    if (syncError) {
+    if (_csyncError) {
        _syncResult.setStatus(SyncResult::Error);
+        qDebug() << "  ** error Strings: " << _errors;
+        _syncResult.setErrorStrings( _errors );
        qDebug() << "    * owncloud csync thread finished with error";
    } else if (_csyncUnavail) {
        _syncResult.setStatus(SyncResult::Error);
        qDebug() << "  ** csync not available.";
-    } else if( _syncResult.foundFilesNotSynced() ) {
+    } else if( _syncResult.warnCount() > 0 ) {
+        // there have been warnings on the way.
        _syncResult.setStatus(SyncResult::Problem);
    } else if( _definition.paused ) {
        // Maybe the sync was terminated because the user paused the folder
@@ -804,28 +909,26 @@ void Folder::slotFolderDiscovered(bool, QString folderName)
 // and hand the result over to the progress dispatcher.
 void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 {
+    if( !pi.isUpdatingEstimates() ) {
+        // this is the beginning of a sync, set the warning level to 0
+        _syncResult.setWarnCount(0);
+    }
    emit progressInfo(pi);
    ProgressDispatcher::instance()->setProgressInfo(alias(), pi);
 }

 // a item is completed: count the errors and forward to the ProgressDispatcher
-void Folder::slotItemCompleted(const SyncFileItemPtr &item)
+void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& job)
 {
-    // add new directories or remove gone away dirs to the watcher
-    if (item->_isDirectory && item->_instruction == CSYNC_INSTRUCTION_NEW ) {
-        FolderMan::instance()->addMonitorPath( alias(), path()+item->_file );
+    if (Progress::isWarningKind(item._status)) {
+        // Count all error conditions.
+        _syncResult.setWarnCount(_syncResult.warnCount()+1);
    }
-    if (item->_isDirectory && item->_instruction == CSYNC_INSTRUCTION_REMOVE ) {
-        FolderMan::instance()->removeMonitorPath( alias(), path()+item->_file );
-    }
-
-    _syncResult.processCompletedItem(item);
-
-    _fileLog->logItem(*item);
-    emit ProgressDispatcher::instance()->itemCompleted(alias(), item);
+    _fileLog->logItem(item);
+    emit ProgressDispatcher::instance()->itemCompleted(alias(), item, job);
 }

-void Folder::slotNewBigFolderDiscovered(const QString &newF, bool isExternal)
+void Folder::slotNewBigFolderDiscovered(const QString &newF)
 {
    auto newFolder = newF;
    if (!newFolder.endsWith(QLatin1Char('/'))) {
@@ -850,11 +953,9 @@ void Folder::slotNewBigFolderDiscovered(const QString &newF, bool isExternal)
            journal->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, undecidedList);
            emit newBigFolderDiscovered(newFolder);
        }
-        QString message = !isExternal ?
-            (tr("A new folder larger than %1 MB has been added: %2.\n")
-                .arg(ConfigFile().newBigFolderSizeLimit().second).arg(newF))
-            : (tr("A folder from an external storage has been added.\n"));
-        message += tr("Please go in the settings to select it if you wish to download it.");
+        QString message = tr("A new folder larger than %1 MB has been added: %2.\n"
+                             "Please go in the settings to select it if you wish to download it.")
+                .arg(ConfigFile().newBigFolderSizeLimit().second).arg(newF);

        auto logger = Logger::instance();
        logger->postOptionalGuiLog(Theme::instance()->appNameGUI(), message);
@@ -883,22 +984,17 @@ void Folder::setSaveBackwardsCompatible(bool save)
    _saveBackwardsCompatible = save;
 }

-void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel)
+void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
 {
    ConfigFile cfgFile;
    if (!cfgFile.promptDeleteFiles())
        return;

-    QString msg = dir == SyncFileItem::Down ?
-        tr("All files in the sync folder '%1' folder were deleted on the server.\n"
-            "These deletes will be synchronized to your local sync folder, making such files "
-            "unavailable unless you have a right to restore. \n"
-            "If you decide to keep the files, they will be re-synced with the server if you have rights to do so.\n"
-            "If you decide to delete the files, they will be unavailable to you, unless you are the owner.") :
-        tr("All the files in your local sync folder '%1' were deleted. These deletes will be "
-            "synchronized with your server, making such files unavailable unless restored.\n"
-            "Are you sure you want to sync those actions with the server?\n"
-            "If this was an accident and you decide to keep your files, they will be re-synced from the server.");
+    QString msg =
+        tr("This sync would remove all the files in the sync folder '%1'.\n"
+           "This might be because the folder was silently reconfigured, or that all "
+           "the files were manually removed.\n"
+           "Are you sure you want to perform this operation?");
    QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"),
                       msg.arg(shortGuiLocalPath()));
    msgBox.addButton(tr("Remove all files"), QMessageBox::DestructiveRole);
@@ -280,15 +280,17 @@ private slots:

    void slotFolderDiscovered(bool local, QString folderName);
    void slotTransmissionProgress(const ProgressInfo& pi);
-    void slotItemCompleted(const SyncFileItemPtr&);
+    void slotItemCompleted(const SyncFileItem&, const PropagatorJob&);

    void slotRunEtagJob();
    void etagRetreived(const QString &);
    void etagRetreivedFromSyncEngine(const QString &);

+    void slotThreadTreeWalkResult(const SyncFileItemVector& ); // after sync is done
+
    void slotEmitFinishedDelayed();

-    void slotNewBigFolderDiscovered(const QString &, bool isExternal);
+    void slotNewBigFolderDiscovered(const QString &);

    void slotLogPropagationStart();

@@ -300,7 +302,7 @@ private slots:
 private:
    bool setIgnoredFiles();

-    void showSyncResultPopup();
+    void bubbleUpSyncResult();

    void checkLocalPath();

@@ -323,6 +325,8 @@ private:

    SyncResult _syncResult;
    QScopedPointer<SyncEngine> _engine;
+    QStringList  _errors;
+    bool         _csyncError;
    bool         _csyncUnavail;
    bool         _wipeDb;
    bool         _proxyDirty;
@@ -260,6 +260,7 @@ int FolderMan::setupFoldersMigration()
 {
    ConfigFile cfg;
    QDir storageDir(cfg.configPath());
+    storageDir.mkpath(QLatin1String("folders"));
    _folderConfigPath = cfg.configPath() + QLatin1String("folders");

    qDebug() << "* Setup folders from " << _folderConfigPath << "(migration)";
@@ -1120,7 +1121,7 @@ void FolderMan::setDirtyNetworkLimits()

 SyncResult FolderMan::accountStatus(const QList<Folder*> &folders)
 {
-    SyncResult overallResult;
+    SyncResult overallResult(SyncResult::Undefined);

    int cnt = folders.count();

@@ -1234,10 +1235,10 @@ SyncResult FolderMan::accountStatus(const QList<Folder*> &folders)
    return overallResult;
 }

-QString FolderMan::statusToString( SyncResult::Status syncStatus, bool paused ) const
+QString FolderMan::statusToString( SyncResult syncStatus, bool paused ) const
 {
    QString folderMessage;
-    switch( syncStatus ) {
+    switch( syncStatus.status() ) {
    case SyncResult::Undefined:
        folderMessage = tr( "Undefined State." );
        break;
@@ -106,7 +106,7 @@ public:
    /** Creates a new and empty local directory. */
    bool startFromScratch( const QString& );

-    QString statusToString(SyncResult::Status, bool paused ) const;
+    QString statusToString(SyncResult, bool paused ) const;

    static SyncResult accountStatus( const QList<Folder*> &folders );

@@ -29,14 +29,6 @@ Q_DECLARE_METATYPE(QPersistentModelIndex)
 namespace OCC {

 static const char propertyParentIndexC[] = "oc_parentIndex";
-static const char propertyPermissionMap[] = "oc_permissionMap";
-
-static QString removeTrailingSlash(const QString &s) {
-    if (s.endsWith('/')) {
-        return s.left(s.size() - 1);
-    }
-    return s;
-}

 FolderStatusModel::FolderStatusModel(QObject *parent)
    :QAbstractItemModel(parent), _accountState(0), _dirty(false)
@@ -170,7 +162,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
        case Qt::CheckStateRole:
            return x._checked;
        case Qt::DecorationRole:
-            return QFileIconProvider().icon(x._isExternal ? QFileIconProvider::Network : QFileIconProvider::Folder);
+            return QFileIconProvider().icon(QFileIconProvider::Folder);
        case Qt::ForegroundRole:
            if (x._isUndecided) {
                return QColor(Qt::red);
@@ -376,9 +368,6 @@ FolderStatusModel::SubFolderInfo* FolderStatusModel::infoForIndex(const QModelIn
        if (parentInfo->hasLabel()) {
            return 0;
        }
-        if (index.row() >= parentInfo->_subs.size()) {
-            return 0;
-        }
        return &parentInfo->_subs[index.row()];
    } else {
        if (index.row() >= _folders.count()) {
@@ -548,15 +537,12 @@ void FolderStatusModel::fetchMore(const QModelIndex& parent)
        path += info->_path;
    }
    LsColJob *job = new LsColJob(_accountState->account(), path, this);
-    job->setProperties(QList<QByteArray>() << "resourcetype" << "http://owncloud.org/ns:size" << "http://owncloud.org/ns:permissions");
+    job->setProperties(QList<QByteArray>() << "resourcetype" << "http://owncloud.org/ns:size");
    job->setTimeout(60 * 1000);
    connect(job, SIGNAL(directoryListingSubfolders(QStringList)),
            SLOT(slotUpdateDirectories(QStringList)));
    connect(job, SIGNAL(finishedWithError(QNetworkReply*)),
            this, SLOT(slotLscolFinishedWithError(QNetworkReply*)));
-    connect(job, SIGNAL(directoryListingIterated(const QString&, const QMap<QString,QString>&)),
-            this, SLOT(slotGatherPermissions(const QString&, const QMap<QString,QString>&)));
-
    job->start();

    QPersistentModelIndex persistentIndex(parent);
@@ -567,20 +553,6 @@ void FolderStatusModel::fetchMore(const QModelIndex& parent)
    QTimer::singleShot(1000, this, SLOT(slotShowFetchProgress()));
 }

-void FolderStatusModel::slotGatherPermissions(const QString &href, const QMap<QString,QString> &map)
-{
-    auto it = map.find("permissions");
-    if (it == map.end())
-        return;
-
-    auto job = sender();
-    auto permissionMap = job->property(propertyPermissionMap).toMap();
-    job->setProperty(propertyPermissionMap, QVariant()); // avoid a detach of the map while it is modified
-    Q_ASSERT(!href.endsWith(QLatin1Char('/'))); // LsColXMLParser::parse removes the trailing slash before calling us.
-    permissionMap[href] = *it;
-    job->setProperty(propertyPermissionMap, permissionMap);
-}
-
 void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
 {
    auto job = qobject_cast<LsColJob *>(sender());
@@ -626,7 +598,6 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
            selectiveSyncUndecidedSet.insert(str);
        }
    }
-    const auto permissionMap = job->property(propertyPermissionMap).toMap();

    QStringList sortedSubfolders = list;
    // skip the parent item (first in the list)
@@ -647,8 +618,8 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
        newInfo._folder = parentInfo->_folder;
        newInfo._pathIdx = parentInfo->_pathIdx;
        newInfo._pathIdx << newSubs.size();
-        newInfo._size = job->_sizes.value(path);
-        newInfo._isExternal = permissionMap.value(removeTrailingSlash(path)).toString().contains("M");
+        auto size = job ? job->_sizes.value(path) : 0;
+        newInfo._size = size;
        newInfo._path = relativePath;
        newInfo._name = relativePath.split('/', QString::SkipEmptyParts).last();

@@ -1010,7 +981,7 @@ void FolderStatusModel::slotFolderSyncStateChange(Folder *f)
    auto& pi = _folders[folderIndex]._progress;

    SyncResult::Status state = f->syncResult().status();
-    if (!f->canSync()) {
+    if (f->syncPaused()) {
        // Reset progress info.
        pi = SubFolderInfo::Progress();
    } else if (state == SyncResult::NotYetStarted) {
@@ -1041,10 +1012,18 @@ void FolderStatusModel::slotFolderSyncStateChange(Folder *f)
    // update the icon etc. now
    slotUpdateFolderState(f);

-    if (state == SyncResult::Success && f->syncResult().folderStructureWasChanged()) {
-        // There is a new or a removed folder. reset all data
-        auto & info = _folders[folderIndex];
-        info.resetSubs(this, index(folderIndex));
+    if (state == SyncResult::Success) {
+        foreach (const SyncFileItemPtr &i, f->syncResult().syncFileItemVector()) {
+            if (i->_isDirectory && (i->_instruction == CSYNC_INSTRUCTION_NEW
+                    || i->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE
+                    || i->_instruction == CSYNC_INSTRUCTION_REMOVE
+                    || i->_instruction == CSYNC_INSTRUCTION_RENAME)) {
+                // There is a new or a removed folder. reset all data
+                auto & info = _folders[folderIndex];
+                info.resetSubs(this, index(folderIndex));
+                return;
+            }
+        }
    }
 }

@@ -51,7 +51,7 @@ public:

    struct SubFolderInfo {
        SubFolderInfo()
-            : _folder(0), _size(0), _isExternal(false), _fetched(false), _fetching(false),
+            : _folder(0), _size(0), _fetched(false), _fetching(false),
            _hasError(false), _fetchingLabel(false), _isUndecided(false), _checked(Qt::Checked) {}
        Folder *_folder;
        QString _name;
@@ -59,7 +59,6 @@ public:
        QVector<int> _pathIdx;
        QVector<SubFolderInfo> _subs;
        qint64 _size;
-        bool _isExternal;

        bool _fetched; // If we did the LSCOL for this folder already
        bool _fetching; // Whether a LSCOL job is currently running
@@ -114,7 +113,6 @@ public slots:

 private slots:
    void slotUpdateDirectories(const QStringList &);
-    void slotGatherPermissions(const QString &name, const QMap<QString,QString> &properties);
    void slotLscolFinishedWithError(QNetworkReply *r);
    void slotFolderSyncStateChange(Folder* f);
    void slotFolderScheduleQueueChanged();
@@ -482,8 +482,9 @@ void FolderWizardRemotePath::showWarn( const QString& msg ) const
 FolderWizardSelectiveSync::FolderWizardSelectiveSync(const AccountPtr& account)
 {
    QVBoxLayout *layout = new QVBoxLayout(this);
-    _selectiveSync = new SelectiveSyncWidget(account, this);
-    layout->addWidget(_selectiveSync);
+    _treeView = new SelectiveSyncTreeView(account, this);
+    layout->addWidget(new QLabel(tr("Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.")));
+    layout->addWidget(_treeView);
 }

 FolderWizardSelectiveSync::~FolderWizardSelectiveSync()
@@ -500,17 +501,13 @@ void FolderWizardSelectiveSync::initializePage()
    QString alias        = QFileInfo(targetPath).fileName();
    if (alias.isEmpty())
        alias = Theme::instance()->appName();
-    QStringList initialBlacklist;
-    if (Theme::instance()->wizardSelectiveSyncDefaultNothing()) {
-        initialBlacklist = QStringList("/");
-    }
-    _selectiveSync->setFolderInfo(targetPath, alias, initialBlacklist);
+    _treeView->setFolderInfo(targetPath, alias);
    QWizardPage::initializePage();
 }

 bool FolderWizardSelectiveSync::validatePage()
 {
-    wizard()->setProperty("selectiveSyncBlackList", QVariant(_selectiveSync->createBlackList()));
+    wizard()->setProperty("selectiveSyncBlackList", QVariant(_treeView->createBlackList()));
    return true;
 }

@@ -520,7 +517,7 @@ void FolderWizardSelectiveSync::cleanupPage()
    QString alias        = QFileInfo(targetPath).fileName();
    if (alias.isEmpty())
        alias = Theme::instance()->appName();
-    _selectiveSync->setFolderInfo(targetPath, alias);
+    _treeView->setFolderInfo(targetPath, alias);
    QWizardPage::cleanupPage();
 }

@@ -27,7 +27,7 @@

 namespace OCC {

-class SelectiveSyncWidget;
+class SelectiveSyncTreeView;

 class ownCloudInfo;

@@ -127,7 +127,7 @@ public:
    virtual void cleanupPage() Q_DECL_OVERRIDE;

 private:
-    SelectiveSyncWidget *_selectiveSync;
+    SelectiveSyncTreeView *_treeView;

 };

@@ -32,7 +32,6 @@

 #include <QNetworkProxy>
 #include <QDir>
-#include <QScopedValueRollback>

 namespace OCC {

@@ -67,7 +66,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
    connect(_ui->crashreporterCheckBox, SIGNAL(toggled(bool)), SLOT(saveMiscSettings()));
    connect(_ui->newFolderLimitCheckBox, SIGNAL(toggled(bool)), SLOT(saveMiscSettings()));
    connect(_ui->newFolderLimitSpinBox, SIGNAL(valueChanged(int)), SLOT(saveMiscSettings()));
-    connect(_ui->newExternalStorage, SIGNAL(toggled(bool)), SLOT(saveMiscSettings()));

 #ifndef WITH_CRASHREPORTER
    _ui->crashreporterCheckBox->setVisible(false);
@@ -87,9 +85,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
    _ui->monoIconsCheckBox->setVisible(QDir(themeDir).exists());

    connect(_ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));
-
-    // accountAdded means the wizard was finished and the wizard might change some options.
-    connect(AccountManager::instance(), SIGNAL(accountAdded(AccountState*)), this, SLOT(loadMiscSettings()));
 }

 GeneralSettings::~GeneralSettings()
@@ -104,7 +99,6 @@ QSize GeneralSettings::sizeHint() const {

 void GeneralSettings::loadMiscSettings()
 {
-    QScopedValueRollback<bool> scope(_currentlyLoading, true);
    ConfigFile cfgFile;
    _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
    _ui->desktopNotificationsCheckBox->setChecked(cfgFile.optionalDesktopNotifications());
@@ -112,8 +106,6 @@ void GeneralSettings::loadMiscSettings()
    auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
    _ui->newFolderLimitCheckBox->setChecked(newFolderLimit.first);
    _ui->newFolderLimitSpinBox->setValue(newFolderLimit.second);
-    _ui->newExternalStorage->setChecked(cfgFile.confirmExternalStorage());
-    _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
 }

 void GeneralSettings::slotUpdateInfo()
@@ -138,8 +130,6 @@ void GeneralSettings::slotUpdateInfo()

 void GeneralSettings::saveMiscSettings()
 {
-    if (_currentlyLoading)
-        return;
    ConfigFile cfgFile;
    bool isChecked = _ui->monoIconsCheckBox->isChecked();
    cfgFile.setMonoIcons(isChecked);
@@ -148,7 +138,6 @@ void GeneralSettings::saveMiscSettings()

    cfgFile.setNewBigFolderSizeLimit(_ui->newFolderLimitCheckBox->isChecked(),
                                        _ui->newFolderLimitSpinBox->value());
-    cfgFile.setConfirmExternalStorage(_ui->newExternalStorage->isChecked());
 }

 void GeneralSettings::slotToggleLaunchOnStartup(bool enable)
@@ -45,14 +45,13 @@ private slots:
    void slotToggleOptionalDesktopNotifications(bool);
    void slotUpdateInfo();
    void slotIgnoreFilesEditor();
-    void loadMiscSettings();

 private:
+    void loadMiscSettings();

    Ui::GeneralSettings *_ui;
    QPointer<IgnoreListEditor> _ignoreEditor;
    QPointer<SyncLogDialog> _syncLogDialog;
-    bool _currentlyLoading = false;
 };


@@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>785</width>
+    <width>706</width>
    <height>523</height>
   </rect>
  </property>
@@ -52,37 +52,33 @@
     <property name="title">
      <string>Advanced</string>
     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QPushButton" name="ignoredFilesButton">
-          <property name="text">
-           <string>Edit &amp;Ignored Files</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>555</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QPushButton" name="ignoredFilesButton">
+        <property name="text">
+         <string>Edit &amp;Ignored Files</string>
+        </property>
+       </widget>
      </item>
-      <item>
+      <item row="0" column="1" colspan="2">
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>555</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0" colspan="3">
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <widget class="QCheckBox" name="newFolderLimitCheckBox">
          <property name="text">
-           <string>Ask for confirmation before synchronizing folders larger than</string>
+           <string>Ask &amp;confirmation before downloading folders larger than</string>
          </property>
          <property name="checked">
           <bool>true</bool>
@@ -102,7 +98,7 @@
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
-           <string extracomment="Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; ">MB</string>
+           <string>MB</string>
          </property>
         </widget>
        </item>
@@ -121,14 +117,7 @@
        </item>
       </layout>
      </item>
-      <item>
-       <widget class="QCheckBox" name="newExternalStorage">
-        <property name="text">
-         <string>Ask for confirmation before synchronizing external storages</string>
-        </property>
-       </widget>
-      </item>
-      <item>
+      <item row="2" column="0" colspan="2">
       <widget class="QCheckBox" name="crashreporterCheckBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -141,6 +130,23 @@
        </property>
       </widget>
      </item>
+      <item row="2" column="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
     </layout>
    </widget>
   </item>
@@ -533,11 +533,9 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
            if (f) {
                f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
                                                     _ocWizard->selectiveSyncBlacklist());
-                if (!_ocWizard->isConfirmBigFolderChecked()) {
-                    // The user already accepted the selective sync dialog. everything is in the white list
-                    f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
+                // The user already accepted the selective sync dialog. everything is in the white list
+                f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
                                                     QStringList() << QLatin1String("/"));
-                }
            }
            _ocWizard->appendToConfigurationLog(tr("<font color=\"green\"><b>Local sync folder %1 successfully created!</b></font>").arg(localFolder));
        }
@@ -27,6 +27,7 @@
 #include "syncfileitem.h"
 #include "folder.h"
 #include "openfilemanager.h"
+#include "owncloudpropagator.h"
 #include "activityitemdelegate.h"

 #include "ui_protocolwidget.h"
@@ -44,8 +45,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :

    connect(ProgressDispatcher::instance(), SIGNAL(progressInfo(QString,ProgressInfo)),
            this, SLOT(slotProgressInfo(QString,ProgressInfo)));
-    connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString,SyncFileItemPtr)),
-            this, SLOT(slotItemCompleted(QString,SyncFileItemPtr)));
+    connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString,SyncFileItem,PropagatorJob)),
+            this, SLOT(slotItemCompleted(QString,SyncFileItem,PropagatorJob)));

    connect(_ui->_treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), SLOT(slotOpenFile(QTreeWidgetItem*,int)));

@@ -221,11 +222,15 @@ void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo
    }
 }

-void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
+void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem &item, const PropagatorJob &job)
 {
-    QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, *item);
+    if (qobject_cast<const PropagateDirectory*>(&job)) {
+        return;
+    }
+
+    QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, item);
    if(line) {
-       if( item->hasErrorStatus() ) {
+       if( item.hasErrorStatus() ) {
            _issueItemView->insertTopLevelItem(0, line);
            emit issueItemCountUpdated(_issueItemView->topLevelItemCount());
        } else {
@@ -52,7 +52,7 @@ public:

 public slots:
    void slotProgressInfo( const QString& folder, const ProgressInfo& progress );
-    void slotItemCompleted( const QString& folder, const SyncFileItemPtr& item);
+    void slotItemCompleted( const QString& folder, const SyncFileItem& item, const PropagatorJob& job);
    void slotOpenFile( QTreeWidgetItem* item, int );

 protected:
@@ -18,7 +18,6 @@
 #include "networkjobs.h"
 #include "theme.h"
 #include "folderman.h"
-#include "configfile.h"
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 #include <QTreeWidget>
@@ -30,7 +29,6 @@
 #include <QScopedValueRollback>
 #include <QTreeWidgetItem>
 #include <QLabel>
-#include <QVBoxLayout>

 namespace OCC {

@@ -56,48 +54,32 @@ private:
    }
 };

-SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent)
-    : QWidget(parent)
-    , _account(account)
-    , _inserting(false)
-    , _folderTree(new QTreeWidget(this))
+SelectiveSyncTreeView::SelectiveSyncTreeView(AccountPtr account, QWidget* parent)
+    : QTreeWidget(parent), _inserting(false), _account(account)
 {
-    _loading = new QLabel(tr("Loading ..."), _folderTree);
-
-    auto layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    auto header = new QLabel(this);
-    header->setText(tr("Deselect remote folders you do not wish to synchronize."));
-    header->setWordWrap(true);
-    layout->addWidget(header);
-
-    layout->addWidget(_folderTree);
-
-    connect(_folderTree, SIGNAL(itemExpanded(QTreeWidgetItem*)),
-            SLOT(slotItemExpanded(QTreeWidgetItem*)));
-    connect(_folderTree, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
-            SLOT(slotItemChanged(QTreeWidgetItem*,int)));
-    _folderTree->setSortingEnabled(true);
-    _folderTree->sortByColumn(0, Qt::AscendingOrder);
-    _folderTree->setColumnCount(2);
+    _loading = new QLabel(tr("Loading ..."), this);
+    connect(this, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*)));
+    connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemChanged(QTreeWidgetItem*,int)));
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
+    setColumnCount(2);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    _folderTree->header()->setSectionResizeMode(0, QHeaderView::QHeaderView::ResizeToContents);
-    _folderTree->header()->setSectionResizeMode(1, QHeaderView::QHeaderView::ResizeToContents);
+    header()->setSectionResizeMode(0, QHeaderView::QHeaderView::ResizeToContents);
+    header()->setSectionResizeMode(1, QHeaderView::QHeaderView::ResizeToContents);
 #else
-    _folderTree->header()->resizeSection(0, sizeHint().width()/2);
+    header()->resizeSection(0, sizeHint().width()/2);
 #endif
-    _folderTree->header()->setStretchLastSection(true);
-    _folderTree->headerItem()->setText(0, tr("Name"));
-    _folderTree->headerItem()->setText(1, tr("Size"));
+    header()->setStretchLastSection(true);
+    headerItem()->setText(0, tr("Name"));
+    headerItem()->setText(1, tr("Size"));
 }

-QSize SelectiveSyncWidget::sizeHint() const
+QSize SelectiveSyncTreeView::sizeHint() const
 {
-    return QWidget::sizeHint().expandedTo(QSize(600, 600));
+    return QTreeView::sizeHint().expandedTo(QSize(400, 400));
 }

-void SelectiveSyncWidget::refreshFolders()
+void SelectiveSyncTreeView::refreshFolders()
 {
    LsColJob *job = new LsColJob(_account, _folderPath, this);
    job->setProperties(QList<QByteArray>() << "resourcetype" << "http://owncloud.org/ns:size");
@@ -106,12 +88,12 @@ void SelectiveSyncWidget::refreshFolders()
    connect(job, SIGNAL(finishedWithError(QNetworkReply*)),
            this, SLOT(slotLscolFinishedWithError(QNetworkReply*)));
    job->start();
-    _folderTree->clear();
+    clear();
    _loading->show();
-    _loading->move(10, _folderTree->header()->height() + 10);
+    _loading->move(10,header()->height() + 10);
 }

-void SelectiveSyncWidget::setFolderInfo(const QString& folderPath, const QString& rootName, const QStringList& oldBlackList)
+void SelectiveSyncTreeView::setFolderInfo(const QString& folderPath, const QString& rootName, const QStringList& oldBlackList)
 {
    _folderPath = folderPath;
    if (_folderPath.startsWith(QLatin1Char('/'))) {
@@ -134,7 +116,7 @@ static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& t
    return 0;
 }

-void SelectiveSyncWidget::recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path, qint64 size)
+void SelectiveSyncTreeView::recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path, qint64 size)
 {
    QFileIconProvider prov;
    QIcon folderIcon = prov.icon(QFileIconProvider::Folder);
@@ -177,13 +159,13 @@ void SelectiveSyncWidget::recursiveInsert(QTreeWidgetItem* parent, QStringList p
    }
 }

-void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
+void SelectiveSyncTreeView::slotUpdateDirectories(QStringList list)
 {
    auto job = qobject_cast<LsColJob *>(sender());
    QScopedValueRollback<bool> isInserting(_inserting);
    _inserting = true;

-    SelectiveSyncTreeViewItem *root = static_cast<SelectiveSyncTreeViewItem*>(_folderTree->topLevelItem(0));
+    SelectiveSyncTreeViewItem *root = static_cast<SelectiveSyncTreeViewItem*>(topLevelItem(0));

    QUrl url = _account->davUrl();
    QString pathToRemove = url.path();
@@ -224,11 +206,15 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
    }

    if (!root) {
-        root = new SelectiveSyncTreeViewItem(_folderTree);
+        root = new SelectiveSyncTreeViewItem(this);
        root->setText(0, _rootName);
        root->setIcon(0, Theme::instance()->applicationIcon());
        root->setData(0, Qt::UserRole, QString());
-        root->setCheckState(0, Qt::Checked);
+        if (_oldBlackList.isEmpty()) {
+            root->setCheckState(0, Qt::Checked);
+        } else {
+            root->setCheckState(0, Qt::PartiallyChecked);
+        }
        qint64 size = job ? job->_sizes.value(pathToRemove, -1) : -1;
        if (size >= 0) {
            root->setText(1, Utility::octetsToString(size));
@@ -250,19 +236,10 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
        recursiveInsert(root, paths, path, size);
    }

-    // Root is partially checked if any children are not checked
-    for (int i = 0; i < root->childCount(); ++i) {
-        const auto child = root->child(i);
-        if (child->checkState(0) != Qt::Checked) {
-            root->setCheckState(0, Qt::PartiallyChecked);
-            break;
-        }
-    }
-
    root->setExpanded(true);
 }

-void SelectiveSyncWidget::slotLscolFinishedWithError(QNetworkReply *r)
+void SelectiveSyncTreeView::slotLscolFinishedWithError(QNetworkReply *r)
 {
    if (r->error() == QNetworkReply::ContentNotFoundError) {
        _loading->setText(tr("No subfolders currently on the server."));
@@ -272,7 +249,7 @@ void SelectiveSyncWidget::slotLscolFinishedWithError(QNetworkReply *r)
    _loading->resize(_loading->sizeHint()); // because it's not in a layout
 }

-void SelectiveSyncWidget::slotItemExpanded(QTreeWidgetItem *item)
+void SelectiveSyncTreeView::slotItemExpanded(QTreeWidgetItem *item)
 {
    QString dir = item->data(0, Qt::UserRole).toString();
    if (dir.isEmpty()) return;
@@ -287,7 +264,7 @@ void SelectiveSyncWidget::slotItemExpanded(QTreeWidgetItem *item)
    job->start();
 }

-void SelectiveSyncWidget::slotItemChanged(QTreeWidgetItem *item, int col)
+void SelectiveSyncTreeView::slotItemChanged(QTreeWidgetItem *item, int col)
 {
    if (col != 0 || _inserting)
        return;
@@ -345,10 +322,10 @@ void SelectiveSyncWidget::slotItemChanged(QTreeWidgetItem *item, int col)
    }
 }

-QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem* root) const
+QStringList SelectiveSyncTreeView::createBlackList(QTreeWidgetItem* root) const
 {
    if (!root) {
-        root = _folderTree->topLevelItem(0);
+        root = topLevelItem(0);
    }
    if (!root) return QStringList();

@@ -377,15 +354,15 @@ QStringList SelectiveSyncWidget::createBlackList(QTreeWidgetItem* root) const
    return result;
 }

-QStringList SelectiveSyncWidget::oldBlackList() const
+QStringList SelectiveSyncTreeView::oldBlackList() const
 {
    return _oldBlackList;
 }

-qint64 SelectiveSyncWidget::estimatedSize(QTreeWidgetItem* root)
+qint64 SelectiveSyncTreeView::estimatedSize(QTreeWidgetItem* root)
 {
    if (!root) {
-        root = _folderTree->topLevelItem(0);
+        root = topLevelItem(0);
    }
    if (!root) return -1;

@@ -419,10 +396,10 @@ SelectiveSyncDialog::SelectiveSyncDialog(AccountPtr account, Folder* folder, QWi
      _okButton(0) // defined in init()
 {
    bool ok;
-    init(account);
+    init(account, tr("Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore"));
    QStringList selectiveSyncList = _folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
    if( ok ) {
-        _selectiveSync->setFolderInfo(_folder->remotePath(), _folder->alias(),selectiveSyncList);
+        _treeView->setFolderInfo(_folder->remotePath(), _folder->alias(),selectiveSyncList);
    } else {
        _okButton->setEnabled(false);
    }
@@ -434,16 +411,22 @@ SelectiveSyncDialog::SelectiveSyncDialog(AccountPtr account, const QString &fold
                                         const QStringList& blacklist, QWidget* parent, Qt::WindowFlags f)
    : QDialog(parent, f), _folder(0)
 {
-    init(account);
-    _selectiveSync->setFolderInfo(folder, folder, blacklist);
+    init(account,
+         Theme::instance()->wizardSelectiveSyncDefaultNothing() ?
+            tr("Choose What to Sync: Select remote subfolders you wish to synchronize.") :
+            tr("Choose What to Sync: Deselect remote subfolders you do not wish to synchronize."));
+    _treeView->setFolderInfo(folder, folder, blacklist);
 }

-void SelectiveSyncDialog::init(const AccountPtr &account)
+void SelectiveSyncDialog::init(const AccountPtr &account, const QString &labelText)
 {
    setWindowTitle(tr("Choose What to Sync"));
    QVBoxLayout *layout = new QVBoxLayout(this);
-    _selectiveSync = new SelectiveSyncWidget(account, this);
-    layout->addWidget(_selectiveSync);
+    _treeView = new SelectiveSyncTreeView(account, this);
+    auto label = new QLabel(labelText);
+    label->setWordWrap(true);
+    layout->addWidget(label);
+    layout->addWidget(_treeView);
    QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal);
    _okButton = buttonBox->addButton(QDialogButtonBox::Ok);
    connect(_okButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -461,7 +444,7 @@ void SelectiveSyncDialog::accept()
        if( ! ok ) {
            return;
        }
-        QStringList blackList = _selectiveSync->createBlackList();
+        QStringList blackList = _treeView->createBlackList();
        _folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, blackList);

        FolderMan *folderMan = FolderMan::instance();
@@ -484,18 +467,19 @@ void SelectiveSyncDialog::accept()

 QStringList SelectiveSyncDialog::createBlackList() const
 {
-    return _selectiveSync->createBlackList();
+    return _treeView->createBlackList();
 }

 QStringList SelectiveSyncDialog::oldBlackList() const
 {
-    return _selectiveSync->oldBlackList();
+    return _treeView->oldBlackList();
 }

 qint64 SelectiveSyncDialog::estimatedSize()
 {
-    return _selectiveSync->estimatedSize();
+    return _treeView->estimatedSize();
 }

+
 }

@@ -26,50 +26,40 @@ namespace OCC {
 class Folder;

 /**
- * @brief The SelectiveSyncWidget contains a folder tree with labels
+ * @brief The SelectiveSyncTreeView class
 * @ingroup gui
 */
-class SelectiveSyncWidget : public QWidget {
+class SelectiveSyncTreeView : public QTreeWidget {
    Q_OBJECT
 public:
-    explicit SelectiveSyncWidget(AccountPtr account, QWidget* parent = 0);
+    explicit SelectiveSyncTreeView(AccountPtr account, QWidget* parent = 0);

    /// Returns a list of blacklisted paths, each including the trailing /
    QStringList createBlackList(QTreeWidgetItem* root = 0) const;
-
-    /** Returns the oldBlackList passed into setFolderInfo(), except that
-     *  a "/" entry is expanded to all top-level folder names.
-     */
    QStringList oldBlackList() const;

    // Estimates the total size of checked items (recursively)
    qint64 estimatedSize(QTreeWidgetItem *root = 0);
+    void refreshFolders();

    // oldBlackList is a list of excluded paths, each including a trailing /
    void setFolderInfo(const QString &folderPath, const QString &rootName,
                       const QStringList &oldBlackList = QStringList());

    QSize sizeHint() const Q_DECL_OVERRIDE;
-
 private slots:
    void slotUpdateDirectories(QStringList);
    void slotItemExpanded(QTreeWidgetItem *);
    void slotItemChanged(QTreeWidgetItem*,int);
    void slotLscolFinishedWithError(QNetworkReply*);
 private:
-    void refreshFolders();
    void recursiveInsert(QTreeWidgetItem* parent, QStringList pathTrail, QString path, qint64 size);
-
-    AccountPtr _account;
-
    QString _folderPath;
    QString _rootName;
    QStringList _oldBlackList;
-
    bool _inserting; // set to true when we are inserting new items on the list
+    AccountPtr _account;
    QLabel *_loading;
-
-    QTreeWidget *_folderTree;
 };

 /**
@@ -95,9 +85,9 @@ public:

 private:

-    void init(const AccountPtr &account);
+    void init(const AccountPtr &account, const QString &label);

-    SelectiveSyncWidget *_selectiveSync;
+    SelectiveSyncTreeView *_treeView;

    Folder *_folder;
    QPushButton *_okButton;
@@ -145,18 +145,18 @@ void SyncRunFileLog::logItem( const SyncFileItem& item )

    const QChar L = QLatin1Char('|');
    _out << ts << L;
-    _out << L;
-    if( item._instruction != CSYNC_INSTRUCTION_RENAME ) {
+    _out << QString::number(item._requestDuration) << L;
+    if( item.log._instruction != CSYNC_INSTRUCTION_RENAME ) {
        _out << item._file << L;
    } else {
        _out << item._file << QLatin1String(" -> ") << item._renameTarget << L;
    }
-    _out << instructionToStr( item._instruction ) << L;
+    _out << instructionToStr( item.log._instruction ) << L;
    _out << directionToStr( item._direction ) << L;
-    _out << QString::number(item._modtime) << L;
-    _out << item._etag << L;
-    _out << QString::number(item._size) << L;
-    _out << item._fileId << L;
+    _out << QString::number(item.log._modtime) << L;
+    _out << item.log._etag << L;
+    _out << QString::number(item.log._size) << L;
+    _out << item.log._fileId << L;
    _out << item._status << L;
    _out << item._errorString << L;
    _out << QString::number(item._httpErrorCode) << L;
@@ -68,15 +68,6 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
    _ui.lServerIcon->setPixmap(appIcon.pixmap(48));
    _ui.lLocalIcon->setText(QString());
    _ui.lLocalIcon->setPixmap(QPixmap(Theme::hidpiFileName(":/client/resources/folder-sync.png")));
-
-    if (theme->wizardHideExternalStorageConfirmationCheckbox()) {
-        _ui.confCheckBoxExternal->hide();
-    }
-    if (theme->wizardHideFolderSizeLimitCheckbox()) {
-        _ui.confCheckBoxSize->hide();
-        _ui.confSpinBox->hide();
-        _ui.confTraillingSizeLabel->hide();
-    }
 }

 void OwncloudAdvancedSetupPage::setupCustomization()
@@ -127,12 +118,6 @@ void OwncloudAdvancedSetupPage::initializePage()
        _selectiveSyncBlacklist = QStringList("/");
        QTimer::singleShot(0, this, SLOT(slotSelectiveSyncClicked()));
    }
-
-    ConfigFile cfgFile;
-    auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
-    _ui.confCheckBoxSize->setChecked(newFolderLimit.first);
-    _ui.confSpinBox->setValue(newFolderLimit.second);
-    _ui.confCheckBoxExternal->setChecked(cfgFile.confirmExternalStorage());
 }

 // Called if the user changes the user- or url field. Adjust the texts and
@@ -215,11 +200,6 @@ QStringList OwncloudAdvancedSetupPage::selectiveSyncBlacklist() const
    return _selectiveSyncBlacklist;
 }

-bool OwncloudAdvancedSetupPage::isConfirmBigFolderChecked() const
-{
-    return _ui.rSyncEverything->isChecked() && _ui.confCheckBoxSize->isChecked();
-}
-
 bool OwncloudAdvancedSetupPage::validatePage()
 {
    if(!_created) {
@@ -228,13 +208,6 @@ bool OwncloudAdvancedSetupPage::validatePage()
        startSpinner();
        emit completeChanged();

-        if (_ui.rSyncEverything->isChecked()) {
-            ConfigFile cfgFile;
-            cfgFile.setNewBigFolderSizeLimit(_ui.confCheckBoxSize->isChecked(),
-                                                _ui.confSpinBox->value());
-            cfgFile.setConfirmExternalStorage(_ui.confCheckBoxExternal->isChecked());
-        }
-
        emit createLocalAndRemoteFolders(localFolder(), _remoteFolder);
        return false;
    } else {
@@ -41,7 +41,6 @@ public:
  bool validatePage() Q_DECL_OVERRIDE;
  QString localFolder() const;
  QStringList selectiveSyncBlacklist() const;
-  bool isConfirmBigFolderChecked() const;
  void setRemoteFolder( const QString& remoteFolder);
  void setMultipleFoldersExist( bool exist );
  void directoriesCreated();
@@ -6,12 +6,12 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>912</width>
-    <height>633</height>
+    <width>917</width>
+    <height>493</height>
   </rect>
  </property>
  <property name="sizePolicy">
-   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
    <horstretch>0</horstretch>
    <verstretch>0</verstretch>
   </sizepolicy>
@@ -226,14 +226,11 @@
     <item row="0" column="1" colspan="2">
      <widget class="QWidget" name="widget" native="true">
       <layout class="QVBoxLayout" name="verticalLayout">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="spacing">
+           <number>0</number>
+          </property>
          <item>
           <widget class="QRadioButton" name="rSyncEverything">
            <property name="text">
@@ -266,64 +263,6 @@
          </item>
         </layout>
        </item>
-        <item>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <property name="horizontalSpacing">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Minimum</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>10</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="1">
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QCheckBox" name="confCheckBoxSize">
-              <property name="text">
-               <string>Ask for confirmation before synchroni&amp;zing folders larger than</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="confSpinBox">
-              <property name="maximum">
-               <number>999999</number>
-              </property>
-              <property name="value">
-               <number>99</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="confTraillingSizeLabel">
-              <property name="text">
-               <string extracomment="Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; ">MB</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="confCheckBoxExternal">
-            <property name="text">
-             <string>Ask for confirmation before synchronizing e&amp;xternal storages</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
@@ -406,70 +345,5 @@
  </layout>
 </widget>
 <resources/>
- <connections>
-  <connection>
-   <sender>rSyncEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>confCheckBoxSize</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>217</x>
-     <y>78</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>298</x>
-     <y>126</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>rSyncEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>confSpinBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>311</x>
-     <y>83</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>952</x>
-     <y>134</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>rSyncEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>confTraillingSizeLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>277</x>
-     <y>76</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1076</x>
-     <y>136</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>rSyncEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>confCheckBoxExternal</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>181</x>
-     <y>78</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>382</x>
-     <y>174</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>506</width>
-    <height>515</height>
+    <width>602</width>
+    <height>193</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -80,7 +80,7 @@
         <item>
          <widget class="QLabel" name="label_2">
           <property name="text">
-            <string>Ser&amp;ver Address</string>
+            <string>Server &amp;Address</string>
           </property>
           <property name="buddy">
            <cstring>leUrl</cstring>
@@ -166,13 +166,10 @@
     <property name="orientation">
      <enum>Qt::Vertical</enum>
     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
     <property name="sizeHint" stdset="0">
      <size>
       <width>20</width>
-       <height>200</height>
+       <height>40</height>
      </size>
     </property>
    </spacer>
@@ -44,7 +44,6 @@ void OwncloudShibbolethCredsPage::setupBrowser()
    // i.e. if someone presses "back"
    QNetworkAccessManager *qnam = account->networkAccessManager();
    CookieJar *jar = new CookieJar;
-    jar->restore(account->cookieJarPath());
    // Implicitly deletes the old cookie jar, and reparents the jar
    qnam->setCookieJar(jar);

@@ -86,6 +86,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
    setTitleFormat(Qt::RichText);
    setSubTitleFormat(Qt::RichText);
    setButtonText(QWizard::CustomButton1, tr("Skip folders configuration"));
+
 }

 void OwncloudWizard::setAccount(AccountPtr account)
@@ -108,10 +109,6 @@ QStringList OwncloudWizard::selectiveSyncBlacklist() const
    return _advancedSetupPage->selectiveSyncBlacklist();
 }

-bool OwncloudWizard::isConfirmBigFolderChecked() const
-{
-    return _advancedSetupPage->isConfirmBigFolderChecked();
-}

 QString OwncloudWizard::ocUrl() const
 {
@@ -59,7 +59,6 @@ public:
    QString ocUrl() const;
    QString localFolder() const;
    QStringList selectiveSyncBlacklist() const;
-    bool isConfirmBigFolderChecked() const;

    void enableFinishOnResultWidget(bool enable);

@@ -57,6 +57,7 @@ set(libsync_SRCS
    propagateremotedelete.cpp
    propagateremotemove.cpp
    propagateremotemkdir.cpp
+    propagatefiles.cpp
    syncengine.cpp
    syncfilestatus.cpp
    syncfilestatustracker.cpp
@@ -172,6 +172,7 @@ void AbstractNetworkJob::slotFinished()

    // get the Date timestamp from reply
    _responseTimestamp = _reply->rawHeader("Date");
+    _duration = _durationTimer.elapsed();

    if (_followRedirects) {
        // ### the qWarnings here should be exported via displayErrors() so they
@@ -205,6 +206,11 @@ void AbstractNetworkJob::slotFinished()
    }
 }

+quint64 AbstractNetworkJob::duration()
+{
+    return _duration;
+}
+
 QByteArray AbstractNetworkJob::responseTimestamp()
 {
    return _responseTimestamp;
@@ -218,6 +224,8 @@ AbstractNetworkJob::~AbstractNetworkJob()
 void AbstractNetworkJob::start()
 {
    _timer.start();
+    _durationTimer.start();
+    _duration = 0;

    const QUrl url = account()->url();
    const QString displayUrl = QString( "%1://%2%3").arg(url.scheme()).arg(url.host()).arg(url.path());
@@ -55,6 +55,7 @@ public:
    bool ignoreCredentialFailure() const { return _ignoreCredentialFailure; }

    QByteArray responseTimestamp();
+    quint64 duration();

    qint64 timeoutMsec() { return _timer.interval(); }

@@ -81,6 +82,8 @@ protected:
    int maxRedirects() const { return 10; }
    virtual bool finished() = 0;
    QByteArray    _responseTimestamp;
+    QElapsedTimer _durationTimer;
+    quint64       _duration;
    bool          _timedout;  // set to true when the timeout slot is received

    // Automatically follows redirects. Note that this only works for
@@ -169,12 +169,6 @@ void Account::lendCookieJarTo(QNetworkAccessManager *guest)
    jar->setParent(oldParent); // takes it back
 }

-QString Account::cookieJarPath()
-{
-    ConfigFile cfg;
-    return cfg.configPath() + "/cookies" + id() + ".db";
-}
-
 void Account::resetNetworkAccessManager()
 {
    if (!_credentials || !_am) {
@@ -172,7 +172,6 @@ public:

    void clearCookieJar();
    void lendCookieJarTo(QNetworkAccessManager *guest);
-    QString cookieJarPath();

    void resetNetworkAccessManager();
    QNetworkAccessManager* networkAccessManager();
@@ -116,6 +116,15 @@ bool Capabilities::chunkingNg() const
    return _capabilities["dav"].toMap()["chunking"].toByteArray() >= "1.0";
 }

+bool Capabilities::scheduling() const
+{
+    static const auto scheduling = qgetenv("OWNCLOUD_SCHEDULING");
+    if (scheduling == "0") return false;
+    if (scheduling == "1") return true;
+
+    return _capabilities["dav"].toMap()["scheduling"].toByteArray() >= "1.0";
+}
+
 bool Capabilities::chunkingParallelUploadDisabled() const
 {
    return _capabilities["dav"].toMap()["chunkingParallelUploadDisabled"].toBool();
@@ -41,6 +41,7 @@ public:
    int  sharePublicLinkExpireDateDays() const;
    bool shareResharing() const;
    bool chunkingNg() const;
+    bool scheduling() const;

    /// disable parallel upload in chunking
    bool chunkingParallelUploadDisabled() const;
@@ -111,10 +111,10 @@ bool uploadChecksumEnabled()
 QByteArray contentChecksumType()
 {
    static QByteArray type = qgetenv("OWNCLOUD_CONTENT_CHECKSUM_TYPE");
-    if (type.isNull()) { // can set to "" to disable checksumming
-        type = "SHA1";
+    if (!type.isNull()) { // can set to "" to disable checksumming
+        return type;
    }
-    return type;
+    return "SHA1";
 }

 ComputeChecksum::ComputeChecksum(QObject* parent)
@@ -52,6 +52,7 @@ static const char updateCheckIntervalC[] = "updateCheckInterval";
 static const char geometryC[] = "geometry";
 static const char timeoutC[] = "timeout";
 static const char chunkSizeC[] = "chunkSize";
+static const char smallFileSizeC[] = "smallFileSize";

 static const char proxyHostC[] = "Proxy/host";
 static const char proxyTypeC[] = "Proxy/type";
@@ -67,7 +68,6 @@ static const char downloadLimitC[]    = "BWLimit/downloadLimit";

 static const char newBigFolderSizeLimitC[] = "newBigFolderSizeLimit";
 static const char useNewBigFolderSizeLimitC[] = "useNewBigFolderSizeLimit";
-static const char confirmExternalStorageC[] = "confirmExternalStorage";

 static const char maxLogLinesC[] = "Logging/maxLogLines";

@@ -129,6 +129,12 @@ quint64 ConfigFile::chunkSize() const
    return settings.value(QLatin1String(chunkSizeC), 10*1000*1000).toLongLong(); // default to 10 MB
 }

+quint64 ConfigFile::smallFileSize() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(smallFileSizeC), 500*1000).toLongLong(); // default to 500 kB
+}
+
 void ConfigFile::setOptionalDesktopNotifications(bool show)
 {
    QSettings settings(configFile(), QSettings::IniFormat);
@@ -597,16 +603,6 @@ void ConfigFile::setNewBigFolderSizeLimit(bool isChecked, quint64 mbytes)
    setValue(useNewBigFolderSizeLimitC, isChecked);
 }

-bool ConfigFile::confirmExternalStorage() const
-{
-    return getValue(confirmExternalStorageC, QString(), true).toBool();
-}
-
-void ConfigFile::setConfirmExternalStorage(bool isChecked)
-{
-    setValue(confirmExternalStorageC, isChecked);
-}
-
 bool ConfigFile::promptDeleteFiles() const
 {
    QSettings settings(configFile(), QSettings::IniFormat);
@@ -105,8 +105,6 @@ public:
    /** [checked, size in MB] **/
    QPair<bool, quint64> newBigFolderSizeLimit() const;
    void setNewBigFolderSizeLimit(bool isChecked, quint64 mbytes);
-    bool confirmExternalStorage() const;
-    void setConfirmExternalStorage(bool);

    static bool setConfDir(const QString &value);

@@ -115,6 +113,7 @@ public:

    int timeout() const;
    quint64 chunkSize() const;
+    quint64 smallFileSize() const;

    void saveGeometry(QWidget *w);
    void restoreGeometry(QWidget *w);
@@ -68,6 +68,7 @@ QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
 CookieJar::CookieJar(QObject *parent) :
    QNetworkCookieJar(parent)
 {
+    restore();
 }

 CookieJar::~CookieJar()
@@ -96,21 +97,21 @@ void CookieJar::clearSessionCookies()
    setAllCookies(removeExpired(allCookies()));
 }

-void CookieJar::save(const QString &fileName)
+void CookieJar::save()
 {
    QFile file;
-    file.setFileName(fileName);
-    qDebug() << fileName;
+    file.setFileName(storagePath());
+    qDebug() << storagePath();
    file.open(QIODevice::WriteOnly);
    QDataStream stream(&file);
    stream << removeExpired(allCookies());
    file.close();
 }

-void CookieJar::restore(const QString &fileName)
+void CookieJar::restore()
 {
    QFile file;
-    file.setFileName(fileName);
+    file.setFileName(storagePath());
    file.open(QIODevice::ReadOnly);
    QDataStream stream(&file);
    QList<QNetworkCookie> list;
@@ -130,4 +131,10 @@ QList<QNetworkCookie> CookieJar::removeExpired(const QList<QNetworkCookie> &cook
    return updatedList;
 }

+QString CookieJar::storagePath() const
+{
+  ConfigFile cfg;
+  return cfg.configPath() + "/cookies.db";
+}
+
 } // namespace OCC
@@ -39,13 +39,15 @@ public:
    using QNetworkCookieJar::setAllCookies;
    using QNetworkCookieJar::allCookies;

-    void save(const QString &fileName);
-    void restore(const QString &fileName);
+    void save();

 signals:
    void newCookiesForUrl(const QList<QNetworkCookie>& cookieList, const QUrl& url);
 private:
+    void restore();
    QList<QNetworkCookie> removeExpired(const QList<QNetworkCookie> &cookies);
+    QString storagePath() const;
+
 };

 } // namespace OCC
@@ -20,9 +20,6 @@
 #include <QUrl>
 #include "account.h"
 #include <QFileInfo>
-#include "theme.h"
-#include <cstring>
-

 namespace OCC {

@@ -84,32 +81,14 @@ int DiscoveryJob::isInSelectiveSyncBlackListCallback(void *data, const char *pat
    return static_cast<DiscoveryJob*>(data)->isInSelectiveSyncBlackList(path);
 }

-bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path, const char *remotePerm)
+bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path)
 {
-
-    if (_syncOptions._confirmExternalStorage && std::strchr(remotePerm, 'M')) {
-        // 'M' in the permission means external storage.
-
-        /* Note: DiscoverySingleDirectoryJob::directoryListingIteratedSlot make sure that only the
-         * root of a mounted storage has 'M', all sub entries have 'm' */
-
-        // Only allow it if the white list contains exactly this path (not parents)
-        // We want to ask confirmation for external storage even if the parents where selected
-        if (_selectiveSyncWhiteList.contains(path + QLatin1Char('/'))) {
-            return false;
-        }
-
-        emit newBigFolder(path, true);
-        return true;
-    }
-
-   // If this path or the parent is in the white list, then we do not block this file
+    // If this path or the parent is in the white list, then we do not block this file
    if (findPathInList(_selectiveSyncWhiteList, path)) {
        return false;
    }

-    auto limit = _syncOptions._newBigFolderSizeLimit;
-    if (limit < 0) {
+    if (_newBigFolderSizeLimit < 0) {
        // no limit, everything is allowed;
        return false;
    }
@@ -123,9 +102,10 @@ bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path, const char *
        _vioWaitCondition.wait(&_vioMutex);
    }

+    auto limit = _newBigFolderSizeLimit;
    if (result >= limit) {
        // we tell the UI there is a new folder
-        emit newBigFolder(path, false);
+        emit newBigFolder(path);
        return true;
    } else {
        // it is not too big, put it in the white list (so we will not do more query for the children)
@@ -139,9 +119,9 @@ bool DiscoveryJob::checkSelectiveSyncNewFolder(const QString& path, const char *
    }
 }

-int DiscoveryJob::checkSelectiveSyncNewFolderCallback(void *data, const char *path, const char *remotePerm)
+int DiscoveryJob::checkSelectiveSyncNewFolderCallback(void *data, const char *path)
 {
-    return static_cast<DiscoveryJob*>(data)->checkSelectiveSyncNewFolder(QString::fromUtf8(path), remotePerm);
+    return static_cast<DiscoveryJob*>(data)->checkSelectiveSyncNewFolder(QString::fromUtf8(path));
 }


@@ -341,9 +321,7 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
        // The first entry is for the folder itself, we should process it differently.
        _ignoredFirst = true;
        if (map.contains("permissions")) {
-            auto perm = map.value("permissions");
-            emit firstDirectoryPermissions(perm);
-            _isExternalStorage = perm.contains(QLatin1Char('M'));
+            emit firstDirectoryPermissions(map.value("permissions"));
        }
        if (map.contains("data-fingerprint")) {
            _dataFingerprint = map.value("data-fingerprint").toUtf8();
@@ -366,13 +344,6 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
        if (!file_stat->etag || strlen(file_stat->etag) == 0) {
            qDebug() << "WARNING: etag of" << file_stat->name << "is" << file_stat->etag << " This must not happen.";
        }
-        if (_isExternalStorage) {
-            /* All the entries in a external storage have 'M' in their permission. However, for all
-               purposes in the desktop client, we only need to know about the mount points.
-               So replace the 'M' by a 'm' for every sub entries in an external storage */
-            std::replace(std::begin(file_stat->remotePerm), std::end(file_stat->remotePerm),
-                         'M', 'm');
-        }

        QStringRef fileRef(&file);
        int slashPos = file.lastIndexOf(QLatin1Char('/'));
@@ -34,15 +34,6 @@ class Account;
 * if the files are new, or changed.
 */

-struct SyncOptions {
-    /** Maximum size (in Bytes) a folder can have without asking for confirmation.
-     * -1 means infinite */
-    qint64 _newBigFolderSizeLimit = -1;
-    /** If a confirmation should be asked for external storages */
-    bool _confirmExternalStorage = false;
-};
-
-
 /**
 * @brief The FileStatPointer class
 * @ingroup libsync
@@ -116,8 +107,6 @@ private:
    bool _ignoredFirst;
    // Set to true if this is the root path and we need to check the data-fingerprint
    bool _isRootPath;
-    // If this directory is an external storage (The first item has 'M' in its permission)
-    bool _isExternalStorage = false;
    QPointer<LsColJob> _lsColJob;

 public:
@@ -187,8 +176,8 @@ class DiscoveryJob : public QObject {
     */
    bool isInSelectiveSyncBlackList(const char* path) const;
    static int isInSelectiveSyncBlackListCallback(void *, const char *);
-    bool checkSelectiveSyncNewFolder(const QString &path, const char *remotePerm);
-    static int checkSelectiveSyncNewFolderCallback(void* data, const char* path, const char* remotePerm);
+    bool checkSelectiveSyncNewFolder(const QString &path);
+    static int checkSelectiveSyncNewFolderCallback(void*, const char*);

    // Just for progress
    static void update_job_update_callback (bool local,
@@ -208,7 +197,7 @@ class DiscoveryJob : public QObject {

 public:
    explicit DiscoveryJob(CSYNC *ctx, QObject* parent = 0)
-            : QObject(parent), _csync_ctx(ctx) {
+            : QObject(parent), _csync_ctx(ctx), _newBigFolderSizeLimit(-1) {
        // We need to forward the log property as csync uses thread local
        // and updates run in another thread
        _log_callback = csync_get_log_callback();
@@ -218,7 +207,7 @@ public:

    QStringList _selectiveSyncBlackList;
    QStringList _selectiveSyncWhiteList;
-    SyncOptions _syncOptions;
+    qint64 _newBigFolderSizeLimit;
    Q_INVOKABLE void start();
 signals:
    void finished(int result);
@@ -229,7 +218,7 @@ signals:
    void doGetSizeSignal(const QString &path, qint64 *result);

    // A new folder was discovered and was not synced because of the confirmation feature
-    void newBigFolder(const QString &folder, bool isExternal);
+    void newBigFolder(const QString &folder);
 };

 }
@@ -47,7 +47,7 @@ void ExcludedFiles::addExcludeFilePath(const QString& path)
    _excludeFiles.insert(path);
 }

-#ifdef WITH_TESTING
+#ifdef WITH_UNIT_TESTING
 void ExcludedFiles::addExcludeExpr(const QString &expr)
 {
    _csync_exclude_add(_excludesPtr, expr.toLatin1().constData());
@@ -58,7 +58,7 @@ public:
            const QString& basePath,
            bool excludeHidden) const;

-#ifdef WITH_TESTING
+#ifdef WITH_UNIT_TESTING
    void addExcludeExpr(const QString &expr);
 #endif

@@ -172,7 +172,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr

    _item->_status = status;

-    emit itemCompleted(_item);
+    emit itemCompleted(*_item, *this);
    emit finished(status);
 }

@@ -221,7 +221,7 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
        if( newJob )  {
            newJob->setRestoreJobMsg(msg);
            _restoreJob.reset(newJob);
-            connect(_restoreJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
+            connect(_restoreJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &, const PropagatorJob &)),
                    this, SLOT(slotRestoreJobCompleted(const SyncFileItemPtr &)));
            QMetaObject::invokeMethod(newJob, "start");
        }
@@ -312,6 +312,13 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
    directories.push(qMakePair(QString(), _rootJob.data()));
    QVector<PropagatorJob*> directoriesToRemove;
    QString removedDirectory;
+
+    // This needs to be changed before marging - capability to switch on/off scheduling, since
+    // server needs to decide if to do that - scheduling will also bring more features in the future
+    // TODO: change it before marging to -> bool enableScheduledRequests = account()->capabilities().scheduling();
+    bool enableScheduledRequests = true;
+
+    PropagateFiles* filesJob = new PropagateFiles(this);
    foreach(const SyncFileItemPtr &item, items) {

        if (!removedDirectory.isEmpty() && item->_file.startsWith(removedDirectory)) {
@@ -388,6 +395,9 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
                currentDirJob->append(dir);
            }
            directories.push(qMakePair(item->destination() + "/" , dir));
+        } else if (enableScheduledRequests
+              && (item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC)) {
+            filesJob->append(item);
        } else if (PropagateItemJob* current = createJob(item)) {
            if (item->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE) {
                // will delete directories, so defer execution
@@ -399,12 +409,20 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
        }
    }

+    if (enableScheduledRequests && !filesJob->isEmpty()){
+        // This job has parallelism WaitForFinished to allow directoriesToRemove be last
+        _rootJob->append(filesJob);
+    } else {
+        delete filesJob;
+    }
+
    foreach(PropagatorJob* it, directoriesToRemove) {
        _rootJob->append(it);
    }

-    connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
-            this, SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+
+    connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+            this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_rootJob.data(), SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
    connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished(SyncFileItem::Status)));
    connect(_rootJob.data(), SIGNAL(ready()), this, SLOT(scheduleNextJob()), Qt::QueuedConnection);
@@ -458,6 +476,20 @@ quint64 OwncloudPropagator::chunkSize()
    return chunkSize;
 }

+quint64 OwncloudPropagator::smallFileSize()
+{
+    // A small filesize item is a file whose transfer time
+    // typically will be lower than its bookkeeping time.
+    static uint smallFileSize;
+    if (!smallFileSize) {
+        smallFileSize = qgetenv("OWNCLOUD_SMALLFILE_SIZE").toUInt();
+        if (smallFileSize == 0) {
+            ConfigFile cfg;
+            smallFileSize = cfg.smallFileSize();
+        }
+    }
+    return smallFileSize;
+}

 bool OwncloudPropagator::localFileNameClash( const QString& relFile )
 {
@@ -588,12 +620,17 @@ OwncloudPropagator *PropagatorJob::propagator() const
 PropagatorJob::JobParallelism PropagateDirectory::parallelism()
 {
    // If any of the non-finished sub jobs is not parallel, we have to wait
-    if (_firstJob && _firstJob->parallelism() != FullParallelism) {
-        return WaitForFinished;
+
+    // FIXME!  we should probably cache this result
+
+    if (_firstJob && _firstJob->_state != Finished) {
+        if (_firstJob->parallelism() != FullParallelism)
+            return WaitForFinished;
    }

+    // FIXME: use the cached value of finished job
    for (int i = 0; i < _subJobs.count(); ++i) {
-        if (_subJobs.at(i)->parallelism() != FullParallelism) {
+        if (_subJobs.at(i)->_state != Finished && _subJobs.at(i)->parallelism() != FullParallelism) {
            return WaitForFinished;
        }
    }
@@ -624,8 +661,15 @@ bool PropagateDirectory::scheduleNextJob()
        return false;
    }

+    // cache the value of first unfinished subjob
    bool stopAtDirectory = false;
-    for (int i = 0; i < _subJobs.size(); ++i) {
+    int i = _firstUnfinishedSubJob;
+    int subJobsCount = _subJobs.count();
+    while (i < subJobsCount && _subJobs.at(i)->_state == Finished) {
+      _firstUnfinishedSubJob = ++i;
+    }
+
+    for (int i = _firstUnfinishedSubJob; i < subJobsCount; ++i) {
        if (_subJobs.at(i)->_state == Finished) {
            continue;
        }
@@ -653,22 +697,8 @@ bool PropagateDirectory::scheduleNextJob()

 void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
 {
-    PropagatorJob *subJob = static_cast<PropagatorJob *>(sender());
-
-    // Delete the job and remove it from our list of jobs.
-    subJob->deleteLater();
-    bool wasFirstJob = false;
-    if (subJob == _firstJob.data()) {
-        wasFirstJob = true;
-        _firstJob.reset();
-    } else {
-        int i = _subJobs.indexOf(subJob);
-        Q_ASSERT(i >= 0);
-        _subJobs.remove(i);
-    }
-
    if (status == SyncFileItem::FatalError ||
-            (wasFirstJob && status != SyncFileItem::Success && status != SyncFileItem::Restoration)) {
+            (sender() == _firstJob.data() && status != SyncFileItem::Success && status != SyncFileItem::Restoration)) {
        abort();
        _state = Finished;
        emit finished(status);
@@ -676,10 +706,18 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
    } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
        _hasError = status;
    }
+    _runningNow--;
+    _jobsFinished++;
+
+    int totalJobs = _subJobs.count();
+    if (_firstJob) {
+        totalJobs++;
+    }

    // We finished processing all the jobs
    // check if we finished
-    if (!_firstJob && _subJobs.isEmpty()) {
+    if (_jobsFinished >= totalJobs) {
+        Q_ASSERT(!_runningNow); // how can we be finished if there are still jobs running now
        finalize();
    } else {
        emit ready();
@@ -114,7 +114,7 @@ signals:
    /**
     * Emitted when one item has been completed within a job.
     */
-    void itemCompleted(const SyncFileItemPtr &);
+    void itemCompleted(const SyncFileItem &, const PropagatorJob &);

    /**
     * Emitted when all the sub-jobs have been finished and
@@ -192,11 +192,14 @@ public:

    SyncFileItemPtr _item;

+    int _jobsFinished; // number of jobs that have completed
+    int _runningNow; // number of subJobs running right now
    SyncFileItem::Status _hasError;  // NoStatus,  or NormalError / SoftError if there was an error
+    int _firstUnfinishedSubJob;

    explicit PropagateDirectory(OwncloudPropagator *propagator, const SyncFileItemPtr &item = SyncFileItemPtr(new SyncFileItem))
        : PropagatorJob(propagator)
-        , _item(item), _hasError(SyncFileItem::NoStatus)
+        , _firstJob(0), _item(item),  _jobsFinished(0), _runningNow(0), _hasError(SyncFileItem::NoStatus), _firstUnfinishedSubJob(0)
    { }

    virtual ~PropagateDirectory() {
@@ -228,9 +231,11 @@ private slots:
    bool possiblyRunNextJob(PropagatorJob *next) {
        if (next->_state == NotYetStarted) {
            connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status)), Qt::QueuedConnection);
-            connect(next, SIGNAL(itemCompleted(const SyncFileItemPtr &)), this, SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+            connect(next, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+                    this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
            connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
            connect(next, SIGNAL(ready()), this, SIGNAL(ready()));
+            _runningNow++;
        }
        return next->scheduleNextJob();
    }
@@ -257,7 +262,6 @@ public:
 class OwncloudPropagator : public QObject {
    Q_OBJECT

-    PropagateItemJob *createJob(const SyncFileItemPtr& item);
    QScopedPointer<PropagateDirectory> _rootJob;

 public:
@@ -322,6 +326,7 @@ public:

    /** returns the size of chunks in bytes  */
    static quint64 chunkSize();
+    static quint64 smallFileSize();

    AccountPtr account() const;

@@ -337,7 +342,11 @@ public:
     */
    DiskSpaceResult diskSpaceCheck() const;

+    PropagateItemJob *createJob(const SyncFileItemPtr& item);

+    int runningAtRootJob(){
+        return _rootJob.data()->_runningNow;
+    }

 private slots:

@@ -351,7 +360,7 @@ private slots:
    void scheduleNextJob();

 signals:
-    void itemCompleted(const SyncFileItemPtr &);
+    void itemCompleted(const SyncFileItem &, const PropagatorJob &);
    void progress(const SyncFileItem&, quint64 bytes);
    void finished(bool success);

@@ -410,6 +419,106 @@ private slots:
    void slotPollFinished();
 };

+/**
+ * @brief The PropagateFiles class is a container class.
+ *
+ * It will also ensure proper bandwidth utilization vs bookkeeping balance
+ *
+ * @ingroup libsync
+ *
+ * State Machine:
+ *
+ *  _________________________________________________ ___________________________________________
+ * |                                                 |                                           |
+ * |                     (Empty DB items queue and populated Data items queue?)                  |
+ * |                       |                                             |                       |
+ * |                   Yes |                                             | No                    |
+ * |                       |                                             |                       |
+ * |<-----------[Schedule Data job]      (Empty Data items queue and populated DB items queue?)  |
+ * |                                                     |              |                        |
+ * |                                                  No |              | Yes                    |
+ * |                                                     |              |                        |
+ * |                                                     |      [Schedule DB job]--------------->|
+ * |                                                     |                                       |
+ * |                                                     |                                       |
+ * |                 (Populated Data items queue and populated DB items queue?)                  |
+ * |                                  |                           |                              |
+ * |                              Yes |                           | No                           |
+ * |                                  |                           |                              |
+ * | (Active running Data items number exceeded limit?)       [Finish - no items]                |
+ * |            |                        |                                                       |
+ * |        No  |                        | Yes                                                   |
+ * |            |                        |                                                       |
+ *  <---[Schedule Data job]          [Schedule DB job]------------------------------------------>
+ *
+ *
+ */
+class PropagateFiles : public PropagatorJob {
+    Q_OBJECT
+public:
+    QVector<PropagatorJob *> _subJobs;
+
+    QVector<SyncFileItemPtr> _syncDBItems; // Items which bookkeeping on the server is longer then the transfer of its payload
+
+    QVector<SyncFileItemPtr> _syncDataItems; // Items which transfer of the payload is longer then bookkeeping on the server
+
+    int _jobsFinished; // number of jobs that have completed
+    SyncFileItem::Status _hasError;  // NoStatus,  or NormalError / SoftError if there was an error
+    int _firstUnfinishedSubJob;
+    int _totalItems;
+    int _activeDBJobsNow;
+    int _activeDataJobsNow;
+
+    explicit PropagateFiles(OwncloudPropagator *propagator)
+        : PropagatorJob(propagator)
+        , _jobsFinished(0), _hasError(SyncFileItem::NoStatus), _firstUnfinishedSubJob(0), _totalItems(0), _activeDBJobsNow(0), _activeDataJobsNow(0) { }
+
+    virtual ~PropagateFiles() {
+        qDeleteAll(_subJobs);
+    }
+
+    bool isEmpty() {
+        return _syncDBItems.isEmpty() && _syncDataItems.isEmpty();
+    }
+
+    void append(const SyncFileItemPtr &item);
+    virtual bool scheduleNextJob() Q_DECL_OVERRIDE;
+    bool scheduleNewJob(QVector<SyncFileItemPtr> &syncJobs);
+    bool scheduleNextItem();
+
+    virtual void abort() Q_DECL_OVERRIDE {
+        foreach (PropagatorJob *n, _subJobs)
+            n->abort();
+    }
+
+    void finalize();
+
+    qint64 committedDiskSpace() const Q_DECL_OVERRIDE;
+
+    JobParallelism parallelism() Q_DECL_OVERRIDE { return OCC::PropagatorJob::WaitForFinished; }
+
+private slots:
+    bool possiblyRunNextJob(PropagatorJob *next) {
+        if (next->_state == NotYetStarted) {
+            connect(next, SIGNAL(finished(SyncFileItem::Status)), this, SLOT(slotSubJobFinished(SyncFileItem::Status)), Qt::QueuedConnection);
+            connect(next, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+                    this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
+            connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
+            connect(next, SIGNAL(ready()), this, SIGNAL(ready()));
+
+            PropagateItemJob *job = qobject_cast<PropagateItemJob *>(next);
+            if(job->_item->_size <= propagator()->smallFileSize()){
+                _activeDBJobsNow++;
+            } else {
+                _activeDataJobsNow++;
+            }
+        }
+        return next->scheduleNextJob();
+    }
+
+    void slotSubJobFinished(SyncFileItem::Status status);
+};
+
 }

 #endif
@@ -28,6 +28,8 @@

 namespace OCC {

+class PropagatorJob;
+
 /**
 * @brief The ProgressInfo class
 * @ingroup libsync
@@ -250,7 +252,9 @@ signals:
    /**
     * @brief: the item was completed by a job
     */
-    void itemCompleted(const QString &folder, const SyncFileItemPtr & item);
+    void itemCompleted(const QString &folder,
+                       const SyncFileItem & item,
+                       const PropagatorJob & job);

 protected:
    void setProgressInfo(const QString& folder, const ProgressInfo& progress);
@@ -520,6 +520,7 @@ void PropagateDownloadFile::slotGetFinished()
        // so make sure we have the up-to-date time
        _item->_modtime = job->lastModified();
    }
+    _item->_requestDuration = job->duration();
    _item->_responseTimeStamp = job->responseTimestamp();

    _tmpFile.close();
@@ -115,7 +115,7 @@ public:
    qint64 committedDiskSpace() const Q_DECL_OVERRIDE;

    // We think it might finish quickly because it is a small file.
-    bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < 100*1024; }
+    bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }

    /**
     * Whether an existing folder with the same name may be deleted before
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) by Piotr Mrowczynski <piotr@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "owncloudpropagator.h"
+
+namespace OCC {
+
+
+qint64 PropagateFiles::committedDiskSpace() const
+{
+    qint64 needed = 0;
+    foreach (PropagatorJob* job, _subJobs) {
+        needed += job->committedDiskSpace();
+    }
+    return needed;
+}
+
+void PropagateFiles::append(const SyncFileItemPtr &item)
+{
+    _totalItems++;
+    if(item->_size <= propagator()->smallFileSize()){
+        _syncDBItems.append(item);
+    } else {
+        _syncDataItems.append(item);
+    }
+}
+
+bool PropagateFiles::scheduleNextJob()
+{
+    if (_state == Finished) {
+        return false;
+    }
+
+    if (_state == NotYetStarted) {
+        _state = Running;
+
+        if (isEmpty()) {
+            finalize();
+            return true;
+        }
+    }
+
+    if (_state == Running) {
+        // This will ensure that all other jobs in the earlier PropagateDirectory are finished, so we can start with data transfers
+        if (propagator()->runningAtRootJob() != 1){
+            return false;
+        }
+    }
+
+    // cache the value of first unfinished subjob
+    int i = _firstUnfinishedSubJob;
+    int subJobsCount = _subJobs.count();
+    while (i < subJobsCount && _subJobs.at(i)->_state == Finished) {
+      _firstUnfinishedSubJob = ++i;
+    }
+    for (int i = _firstUnfinishedSubJob; i < subJobsCount; ++i) {
+        if (_subJobs.at(i)->_state == Finished) {
+            continue;
+        }
+
+        if (possiblyRunNextJob(_subJobs.at(i))) {
+            return true;
+        }
+
+        Q_ASSERT(_subJobs.at(i)->_state == Running);
+    }
+
+    return scheduleNextItem();
+}
+
+bool PropagateFiles::scheduleNewJob(QVector<SyncFileItemPtr> &syncJobs){
+    // This function is used to schedule new job and lazily create job from sync items
+    Q_ASSERT(!syncJobs.isEmpty());
+
+    // Equivalent to Qt5 takeFirst()
+    const SyncFileItemPtr &item = syncJobs.first();
+    PropagateItemJob* job = propagator()->createJob(item);
+    _subJobs.append(job);
+    syncJobs.pop_front();
+    return possiblyRunNextJob(job);
+}
+
+bool PropagateFiles::scheduleNextItem()
+{
+    /// This function holds the whole bookkeeping/data-transfers balance logic
+
+    bool syncDBItemsEmpty = _syncDBItems.isEmpty();
+    bool syncDataItemsEmpty = _syncDataItems.isEmpty();
+
+    if (syncDBItemsEmpty && !syncDataItemsEmpty){
+        // There are no more DB jobs, ensure to maximally parallelise Data Transfers now
+        return scheduleNewJob(_syncDataItems);
+    } else if (!syncDBItemsEmpty && syncDataItemsEmpty){
+        // There are no more data transfer jobs, ensure to maximally parallelise DB jobs now
+        return scheduleNewJob(_syncDBItems);
+    } else if (!syncDBItemsEmpty && !syncDataItemsEmpty){
+        // Both queues have items, ensure bookkeeping and data transfer balance
+        if (_activeDataJobsNow < 2){
+            // By default, we have max 3 connections available for bigger files
+            // On the other hand, we have max 6 for isLikelyToFinishQuickly files (also small files)
+            // It makes sense to use 2 queues for bigger data transfers, and leave the remaining 1-4 for faster operations
+            return scheduleNewJob(_syncDataItems);
+        } else {
+            return scheduleNewJob(_syncDBItems);
+        }
+    }
+
+    // This means that we have no more file-items to sync -> finish
+    return false;
+}
+
+void PropagateFiles::slotSubJobFinished(SyncFileItem::Status status)
+{
+    if (status == SyncFileItem::FatalError) {
+        abort();
+        _state = Finished;
+        emit finished(status);
+        return;
+    } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
+        _hasError = status;
+    }
+
+    PropagateItemJob *job = qobject_cast<PropagateItemJob *>(sender());
+    if(job->_item->_size <= propagator()->smallFileSize()){
+        _activeDBJobsNow--;
+    } else {
+        _activeDataJobsNow--;
+    }
+    Q_ASSERT(job);
+
+    _jobsFinished++;
+
+    // We finished processing all the jobs
+    // check if we finished
+    if (_jobsFinished >= _totalItems) {
+        Q_ASSERT(!_activeDBJobsNow && !_activeDataJobsNow); // how can we be finished if there are still jobs running now
+        finalize();
+    } else {
+        emit ready();
+    }
+}
+
+void PropagateFiles::finalize()
+{
+    _state = Finished;
+    emit finished(_hasError == SyncFileItem::NoStatus ?  SyncFileItem::Success : _hasError);
+}
+
+}
@@ -104,6 +104,7 @@ void PropagateRemoteDelete::slotDeleteJobFinished()
        return;
    }

+    _item->_requestDuration = _job->duration();
    _item->_responseTimeStamp = _job->responseTimestamp();

    // A 404 reply is also considered a success here: We want to make sure
@@ -99,6 +99,7 @@ void PropagateRemoteMkdir::slotMkcolJobFinished()
        return;
    }

+    _item->_requestDuration = _job->duration();
    _item->_responseTimeStamp = _job->responseTimestamp();
    _item->_fileId = _job->reply()->rawHeader("OC-FileId");

@@ -145,6 +145,7 @@ void PropagateRemoteMove::slotMoveJobFinished()
        return;
    }

+    _item->_requestDuration = _job->duration();
    _item->_responseTimeStamp = _job->responseTimestamp();

    if (_item->_httpErrorCode != 201 ) {
@@ -224,9 +224,7 @@ void PropagateUploadFileCommon::slotComputeContentChecksum()
    // change during the checksum calculation
    _item->_modtime = FileSystem::getModTime(filePath);

-#ifdef WITH_TESTING
    _stopWatch.start();
-#endif

    QByteArray checksumType = contentChecksumType();

@@ -253,10 +251,8 @@ void PropagateUploadFileCommon::slotComputeTransmissionChecksum(const QByteArray
    _item->_contentChecksum = contentChecksum;
    _item->_contentChecksumType = contentChecksumType;

-#ifdef WITH_TESTING
    _stopWatch.addLapTime(QLatin1String("ContentChecksum"));
    _stopWatch.start();
-#endif

    // Reuse the content checksum as the transmission checksum if possible
    const auto supportedTransmissionChecksums =
@@ -303,9 +299,7 @@ void PropagateUploadFileCommon::slotStartUpload(const QByteArray& transmissionCh
        done(SyncFileItem::SoftError, tr("File Removed"));
        return;
    }
-#ifdef WITH_TESTING
    _stopWatch.addLapTime(QLatin1String("TransmissionChecksum"));
-#endif

    time_t prevModtime = _item->_modtime; // the _item value was set in PropagateUploadFile::start()
    // but a potential checksum calculation could have taken some time during which the file could
@@ -575,6 +569,7 @@ QMap<QByteArray, QByteArray> PropagateUploadFileCommon::headers()

 void PropagateUploadFileCommon::finalize()
 {
+    _item->_requestDuration = _duration.elapsed();
    _finished = true;

    if (!propagator()->_journal->setFileRecord(SyncJournalFileRecord(*_item, propagator()->getFilePath(_item->_file)))) {
@@ -183,14 +183,13 @@ class PropagateUploadFileCommon : public PropagateItemJob {
    Q_OBJECT

 protected:
+    QElapsedTimer _duration;
    QVector<AbstractNetworkJob*> _jobs; /// network jobs that are currently in transit
-    bool _finished BITFIELD(1); /// Tells that all the jobs have been finished
-    bool _deleteExisting BITFIELD(1);
+    bool _finished; /// Tells that all the jobs have been finished
+    bool _deleteExisting;

    // measure the performance of checksum calc and upload
-#ifdef WITH_TESTING
    Utility::StopWatch _stopWatch;
-#endif

    QByteArray _transmissionChecksum;
    QByteArray _transmissionChecksumType;
@@ -210,7 +209,7 @@ public:

    void start() Q_DECL_OVERRIDE;

-    bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < 100*1024; }
+    bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); }

 private slots:
    void slotComputeContentChecksum();
@@ -80,6 +80,7 @@ QUrl PropagateUploadFileNG::chunkUrl(int chunk)

 void PropagateUploadFileNG::doStartUpload()
 {
+    _duration.start();
    propagator()->_activeJobList.append(this);

    const SyncJournalDb::UploadInfo progressInfo = propagator()->_journal->getUploadInfo(_item->_file);
@@ -97,12 +98,6 @@ void PropagateUploadFileNG::doStartUpload()
                this, SLOT(slotPropfindIterate(QString,QMap<QString,QString>)));
        job->start();
        return;
-    } else if (progressInfo._valid) {
-        // The upload info is stale. remove the stale chunks on the server
-        _transferId = progressInfo._transferid;
-        // Fire and forget. Any error will be ignored.
-        (new DeleteJob(propagator()->account(), chunkUrl(), this))->start();
-        // startNewUpload will reset the _transferId and the UploadInfo in the db.
    }

    startNewUpload();
@@ -483,16 +478,14 @@ void PropagateUploadFileNG::slotMoveJobFinished()
    }
    _item->_responseTimeStamp = job->responseTimestamp();

-#ifdef WITH_TESTING
    // performance logging
-    quint64 duration = _stopWatch.stop();
+    _item->_requestDuration = _stopWatch.stop();
    qDebug() << "*==* duration UPLOAD" << _item->_size
             << _stopWatch.durationOfLap(QLatin1String("ContentChecksum"))
             << _stopWatch.durationOfLap(QLatin1String("TransmissionChecksum"))
-             << duration;
+             << _item->_requestDuration;
    // The job might stay alive for the whole sync, release this tiny bit of memory.
    _stopWatch.reset();
-#endif
    finalize();
 }

@@ -49,6 +49,7 @@ void PropagateUploadFileV1::doStartUpload()
    }

    _currentChunk = 0;
+    _duration.start();

    emit progress(*_item, 0);
    startNextChunk();
@@ -339,16 +340,14 @@ void PropagateUploadFileV1::slotPutFinished()
        done(SyncFileItem::SoftError, "Server does not support X-OC-MTime");
    }

-#ifdef WITH_TESTING
    // performance logging
-    quint64 duration = _stopWatch.stop();
+    _item->_requestDuration = _stopWatch.stop();
    qDebug() << "*==* duration UPLOAD" << _item->_size
             << _stopWatch.durationOfLap(QLatin1String("ContentChecksum"))
             << _stopWatch.durationOfLap(QLatin1String("TransmissionChecksum"))
-             << duration;
+             << _item->_requestDuration;
    // The job might stay alive for the whole sync, release this tiny bit of memory.
    _stopWatch.reset();
-#endif

    finalize();
 }
@@ -23,7 +23,6 @@
 #include "syncfilestatus.h"
 #include "csync_private.h"
 #include "filesystem.h"
-#include "propagateremotedelete.h"

 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -72,11 +71,11 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
  , _backInTimeFiles(0)
  , _uploadLimit(0)
  , _downloadLimit(0)
+  , _newBigFolderSizeLimit(-1)
  , _checksum_hook(journal)
  , _anotherSyncNeeded(NoFollowUpSync)
 {
    qRegisterMetaType<SyncFileItem>("SyncFileItem");
-    qRegisterMetaType<SyncFileItemPtr>("SyncFileItemPtr");
    qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
    qRegisterMetaType<SyncFileStatus>("SyncFileStatus");
    qRegisterMetaType<SyncFileItemVector>("SyncFileItemVector");
@@ -267,11 +266,11 @@ bool SyncEngine::checkErrorBlacklisting( SyncFileItem &item )
    return true;
 }

-void SyncEngine::deleteStaleDownloadInfos(const SyncFileItemVector &syncItems)
+void SyncEngine::deleteStaleDownloadInfos()
 {
    // Find all downloadinfo paths that we want to preserve.
    QSet<QString> download_file_paths;
-    foreach(const SyncFileItemPtr &it, syncItems) {
+    foreach(const SyncFileItemPtr &it, _syncedItems) {
        if (it->_direction == SyncFileItem::Down
                && it->_type == SyncFileItem::File)
        {
@@ -289,11 +288,11 @@ void SyncEngine::deleteStaleDownloadInfos(const SyncFileItemVector &syncItems)
    }
 }

-void SyncEngine::deleteStaleUploadInfos(const SyncFileItemVector &syncItems)
+void SyncEngine::deleteStaleUploadInfos()
 {
    // Find all blacklisted paths that we want to preserve.
    QSet<QString> upload_file_paths;
-    foreach(const SyncFileItemPtr &it, syncItems) {
+    foreach(const SyncFileItemPtr &it, _syncedItems) {
        if (it->_direction == SyncFileItem::Up
                && it->_type == SyncFileItem::File)
        {
@@ -302,23 +301,14 @@ void SyncEngine::deleteStaleUploadInfos(const SyncFileItemVector &syncItems)
    }

    // Delete from journal.
-    auto ids = _journal->deleteStaleUploadInfos(upload_file_paths);
-
-    // Delete the stales chunk on the server.
-    if (account()->capabilities().chunkingNg()) {
-        foreach (uint transferId, ids) {
-            QUrl url = Utility::concatUrlPath(account()->url(), QLatin1String("remote.php/dav/uploads/")
-                + account()->davUser() + QLatin1Char('/') + QString::number(transferId));
-            (new DeleteJob(account(), url, this))->start();
-        }
-    }
+    _journal->deleteStaleUploadInfos(upload_file_paths);
 }

-void SyncEngine::deleteStaleErrorBlacklistEntries(const SyncFileItemVector &syncItems)
+void SyncEngine::deleteStaleErrorBlacklistEntries()
 {
    // Find all blacklisted paths that we want to preserve.
    QSet<QString> blacklist_file_paths;
-    foreach(const SyncFileItemPtr &it, syncItems) {
+    foreach(const SyncFileItemPtr &it, _syncedItems) {
        if (it->_hasBlacklistEntry)
            blacklist_file_paths.insert(it->_file);
    }
@@ -406,8 +396,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    }
    if (file->remotePerm && file->remotePerm[0]) {
        item->_remotePerm = QByteArray(file->remotePerm);
-        if (remote)
-            _remotePerms[item->_file] = item->_remotePerm;
    }

    /* The flag "serverHasIgnoredFiles" is true if item in question is a directory
@@ -438,6 +426,10 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
        _seenFiles.insert(renameTarget);
    }

+    if (remote && file->remotePerm && file->remotePerm[0]) {
+        _remotePerms[item->_file] = file->remotePerm;
+    }
+
    switch(file->error_status) {
    case CSYNC_STATUS_OK:
        break;
@@ -650,6 +642,12 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )

    _needsUpdate = true;

+    item->log._etag          = file->etag;
+    item->log._fileId        = file->file_id;
+    item->log._instruction   = file->instruction;
+    item->log._modtime       = file->modtime;
+    item->log._size          = file->size;
+
    item->log._other_etag        = file->other.etag;
    item->log._other_fileId      = file->other.file_id;
    item->log._other_instruction = file->other.instruction;
@@ -745,6 +743,7 @@ void SyncEngine::startSync()
        qDebug() << "Could not determine free space available at" << _localPath;
    }

+    _syncedItems.clear();
    _syncItemMap.clear();
    _needsUpdate = false;

@@ -831,14 +830,14 @@ void SyncEngine::startSync()
        return;
    }

-    discoveryJob->_syncOptions = _syncOptions;
+    discoveryJob->_newBigFolderSizeLimit = _newBigFolderSizeLimit;
    discoveryJob->moveToThread(&_thread);
    connect(discoveryJob, SIGNAL(finished(int)), this, SLOT(slotDiscoveryJobFinished(int)));
    connect(discoveryJob, SIGNAL(folderDiscovered(bool,QString)),
            this, SIGNAL(folderDiscovered(bool,QString)));

-    connect(discoveryJob, SIGNAL(newBigFolder(QString,bool)),
-            this, SIGNAL(newBigFolder(QString,bool)));
+    connect(discoveryJob, SIGNAL(newBigFolder(QString)),
+            this, SIGNAL(newBigFolder(QString)));


    // This is used for the DiscoveryJob to be able to request the main thread/
@@ -891,7 +890,6 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    _hasForwardInTimeFiles = false;
    _backInTimeFiles = 0;
    bool walkOk = true;
-    _remotePerms.clear();
    _seenFiles.clear();
    _temporarilyUnavailablePaths.clear();
    _renamedFolders.clear();
@@ -913,12 +911,12 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    csync_commit(_csync_ctx);

    // The map was used for merging trees, convert it to a list:
-    SyncFileItemVector syncItems = _syncItemMap.values().toVector();
+    _syncedItems = _syncItemMap.values().toVector();
    _syncItemMap.clear(); // free memory

    // Adjust the paths for the renames.
-    for (SyncFileItemVector::iterator it = syncItems.begin();
-            it != syncItems.end(); ++it) {
+    for (SyncFileItemVector::iterator it = _syncedItems.begin();
+            it != _syncedItems.end(); ++it) {
        (*it)->_file = adjustRenamedPath((*it)->_file);
    }

@@ -926,7 +924,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    if (_account->serverVersionInt() < 0x080100) {
        // Server version older than 8.1 don't support these character in filename.
        static const QRegExp invalidCharRx("[\\\\:?*\"<>|]");
-        for (auto it = syncItems.begin(); it != syncItems.end(); ++it) {
+        for (auto it = _syncedItems.begin(); it != _syncedItems.end(); ++it) {
            if ((*it)->_direction == SyncFileItem::Up &&
                    (*it)->destination().contains(invalidCharRx)) {
                (*it)->_errorString  = tr("File name contains at least one invalid character");
@@ -938,7 +936,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    if (!_hasNoneFiles && _hasRemoveFile) {
        qDebug() << Q_FUNC_INFO << "All the files are going to be changed, asking the user";
        bool cancel = false;
-        emit aboutToRemoveAllFiles(syncItems.first()->_direction, &cancel);
+        emit aboutToRemoveAllFiles(_syncedItems.first()->_direction, &cancel);
        if (cancel) {
            qDebug() << Q_FUNC_INFO << "Abort sync";
            finalize(false);
@@ -953,7 +951,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    if (!databaseFingerprint.isNull()
            && _discoveryMainThread->_dataFingerprint != databaseFingerprint) {
        qDebug() << "data fingerprint changed, assume restore from backup" << databaseFingerprint << _discoveryMainThread->_dataFingerprint;
-        restoreOldFiles(syncItems);
+        restoreOldFiles();
    } else if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2 && _account->serverVersionInt() < 0x090100) {
        // The server before ownCloud 9.1 did not have the data-fingerprint property. So in that
        // case we use heuristics to detect restored backup.  This is disabled with newer version
@@ -963,18 +961,18 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
        bool restore = false;
        emit aboutToRestoreBackup(&restore);
        if (restore) {
-            restoreOldFiles(syncItems);
+            restoreOldFiles();
        }
    }

    // Sort items per destination
-    std::sort(syncItems.begin(), syncItems.end());
+    std::sort(_syncedItems.begin(), _syncedItems.end());

    // make sure everything is allowed
-    checkForPermission(syncItems);
+    checkForPermission();

    // To announce the beginning of the sync
-    emit aboutToPropagate(syncItems);
+    emit aboutToPropagate(_syncedItems);
    // it's important to do this before ProgressInfo::start(), to announce start of new sync
    emit transmissionProgress(*_progressInfo);
    _progressInfo->startEstimateUpdates();
@@ -996,8 +994,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)

    _propagator = QSharedPointer<OwncloudPropagator>(
        new OwncloudPropagator (_account, _localPath, _remotePath, _journal));
-    connect(_propagator.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
-            this, SLOT(slotItemCompleted(const SyncFileItemPtr &)));
+    connect(_propagator.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
+            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_propagator.data(), SIGNAL(progress(const SyncFileItem &,quint64)),
            this, SLOT(slotProgress(const SyncFileItem &,quint64)));
    connect(_propagator.data(), SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)), Qt::QueuedConnection);
@@ -1007,16 +1005,16 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    // apply the network limits to the propagator
    setNetworkLimits(_uploadLimit, _downloadLimit);

-    deleteStaleDownloadInfos(syncItems);
-    deleteStaleUploadInfos(syncItems);
-    deleteStaleErrorBlacklistEntries(syncItems);
+    deleteStaleDownloadInfos();
+    deleteStaleUploadInfos();
+    deleteStaleErrorBlacklistEntries();
    _journal->commit("post stale entry removal");

    // Emit the started signal only after the propagator has been set up.
    if (_needsUpdate)
        emit(started());

-    _propagator->start(syncItems);
+    _propagator->start(_syncedItems);

    qDebug() << "<<#### Post-Reconcile end #################################################### " << _stopWatch.addLapTime(QLatin1String("Post-Reconcile Finished"));
 }
@@ -1053,19 +1051,19 @@ void SyncEngine::setNetworkLimits(int upload, int download)
    }
 }

-void SyncEngine::slotItemCompleted(const SyncFileItemPtr &item)
+void SyncEngine::slotItemCompleted(const SyncFileItem &item, const PropagatorJob &job)
 {
-    const char * instruction_str = csync_instruction_str(item->_instruction);
-    qDebug() << Q_FUNC_INFO << item->_file << instruction_str << item->_status << item->_errorString;
+    const char * instruction_str = csync_instruction_str(item._instruction);
+    qDebug() << Q_FUNC_INFO << item._file << instruction_str << item._status << item._errorString;

-    _progressInfo->setProgressComplete(*item);
+    _progressInfo->setProgressComplete(item);

-    if (item->_status == SyncFileItem::FatalError) {
-        emit csyncError(item->_errorString);
+    if (item._status == SyncFileItem::FatalError) {
+        emit csyncError(item._errorString);
    }

    emit transmissionProgress(*_progressInfo);
-    emit itemCompleted(item);
+    emit itemCompleted(item, job);
 }

 void SyncEngine::slotFinished(bool success)
@@ -1089,6 +1087,7 @@ void SyncEngine::slotFinished(bool success)
    // files needed propagation
    emit transmissionProgress(*_progressInfo);

+    emit treeWalkResult(_syncedItems);
    finalize(success);
 }

@@ -1109,10 +1108,6 @@ void SyncEngine::finalize(bool success)

    // Delete the propagator only after emitting the signal.
    _propagator.clear();
-    _remotePerms.clear();
-    _seenFiles.clear();
-    _temporarilyUnavailablePaths.clear();
-    _renamedFolders.clear();

    _clearTouchedFilesTimer.start();
 }
@@ -1142,13 +1137,13 @@ QString SyncEngine::adjustRenamedPath(const QString& original)
 * Make sure that we are allowed to do what we do by checking the permissions and the selective sync list
 *
 */
-void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)
+void SyncEngine::checkForPermission()
 {
    bool selectiveListOk;
    auto selectiveSyncBlackList = _journal->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &selectiveListOk);
    std::sort(selectiveSyncBlackList.begin(), selectiveSyncBlackList.end());

-    for (SyncFileItemVector::iterator it = syncItems.begin(); it != syncItems.end(); ++it) {
+    for (SyncFileItemVector::iterator it = _syncedItems.begin(); it != _syncedItems.end(); ++it) {
        if ((*it)->_direction != SyncFileItem::Up) {
            // Currently we only check server-side permissions
            continue;
@@ -1165,7 +1160,7 @@ void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)
            (*it)->_errorString = tr("Ignored because of the \"choose what to sync\" blacklist");

            if ((*it)->_isDirectory) {
-                for (SyncFileItemVector::iterator it_next = it + 1; it_next != syncItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
+                for (SyncFileItemVector::iterator it_next = it + 1; it_next != _syncedItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
                    it = it_next;
                    (*it)->_instruction = CSYNC_INSTRUCTION_IGNORE;
                    (*it)->_status = SyncFileItem::FileIgnored;
@@ -1190,7 +1185,7 @@ void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)
                    (*it)->_status = SyncFileItem::NormalError;
                    (*it)->_errorString = tr("Not allowed because you don't have permission to add subfolders to that folder");

-                    for (SyncFileItemVector::iterator it_next = it + 1; it_next != syncItems.end() && (*it_next)->destination().startsWith(path); ++it_next) {
+                    for (SyncFileItemVector::iterator it_next = it + 1; it_next != _syncedItems.end() && (*it_next)->destination().startsWith(path); ++it_next) {
                        it = it_next;
                        if ((*it)->_instruction == CSYNC_INSTRUCTION_RENAME) {
                            // The file was most likely moved in this directory.
@@ -1250,7 +1245,7 @@ void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)
                    if ((*it)->_isDirectory) {
                        // restore all sub items
                        for (SyncFileItemVector::iterator it_next = it + 1;
-                             it_next != syncItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
+                             it_next != _syncedItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
                            it = it_next;

                            if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE) {
@@ -1276,12 +1271,12 @@ void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)
                    // underneath, propagator sees that.
                    if( (*it)->_isDirectory ) {
                        // put a more descriptive message if a top level share dir really is removed.
-                        if( it == syncItems.begin() || !(path.startsWith((*(it-1))->_file)) ) {
+                        if( it == _syncedItems.begin() || !(path.startsWith((*(it-1))->_file)) ) {
                            (*it)->_errorString = tr("Local files and share folder removed.");
                        }

                        for (SyncFileItemVector::iterator it_next = it + 1;
-                             it_next != syncItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
+                             it_next != _syncedItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
                            it = it_next;
                        }
                    }
@@ -1360,7 +1355,7 @@ void SyncEngine::checkForPermission(SyncFileItemVector &syncItems)

                    if ((*it)->_isDirectory) {
                        for (SyncFileItemVector::iterator it_next = it + 1;
-                             it_next != syncItems.end() && (*it_next)->destination().startsWith(path); ++it_next) {
+                             it_next != _syncedItems.end() && (*it_next)->destination().startsWith(path); ++it_next) {
                            it = it_next;
                            (*it)->_instruction = CSYNC_INSTRUCTION_ERROR;
                            (*it)->_status = SyncFileItem::NormalError;
@@ -1389,7 +1384,7 @@ QByteArray SyncEngine::getPermissions(const QString& file) const
    return _remotePerms.value(file);
 }

-void SyncEngine::restoreOldFiles(SyncFileItemVector &syncItems)
+void SyncEngine::restoreOldFiles()
 {
    /* When the server is trying to send us lots of file in the past, this means that a backup
       was restored in the server.  In that case, we should not simply overwrite the newer file
@@ -1397,7 +1392,7 @@ void SyncEngine::restoreOldFiles(SyncFileItemVector &syncItems)
       upload the client file. But we still downloaded the old file in a conflict file just in case
    */

-    for (auto it = syncItems.begin(); it != syncItems.end(); ++it) {
+    for (auto it = _syncedItems.begin(); it != _syncedItems.end(); ++it) {
        if ((*it)->_direction != SyncFileItem::Down)
            continue;

@@ -47,6 +47,7 @@ namespace OCC {
 class SyncJournalFileRecord;
 class SyncJournalDb;
 class OwncloudPropagator;
+class PropagatorJob;

 enum AnotherSyncNeeded
 {
@@ -77,7 +78,10 @@ public:

    bool isSyncRunning() const { return _syncRunning; }

-    void setSyncOptions(const SyncOptions &options) { _syncOptions = options; }
+    /* Set the maximum size a folder can have without asking for confirmation
+     * -1 means infinite
+     */
+    void setNewBigFolderSizeLimit(qint64 limit) { _newBigFolderSizeLimit = limit; }
    bool ignoreHiddenFiles() const { return _csync_ctx->ignore_hidden_files; }
    void setIgnoreHiddenFiles(bool ignore) { _csync_ctx->ignore_hidden_files = ignore; }

@@ -118,7 +122,10 @@ signals:
    void aboutToPropagate(SyncFileItemVector&);

    // after each item completed by a job (successful or not)
-    void itemCompleted(const SyncFileItemPtr&);
+    void itemCompleted(const SyncFileItem&, const PropagatorJob&);
+
+    // after sync is done
+    void treeWalkResult(const SyncFileItemVector&);

    void transmissionProgress( const ProgressInfo& progress );

@@ -139,7 +146,7 @@ signals:
    void aboutToRestoreBackup(bool *restore);

    // A new folder was discovered and was not synced because of the confirmation feature
-    void newBigFolder(const QString &folder, bool isExternal);
+    void newBigFolder(const QString &folder);

    /** Emitted when propagation has problems with a locked file.
     *
@@ -149,7 +156,7 @@ signals:

 private slots:
    void slotRootEtagReceived(const QString &);
-    void slotItemCompleted(const SyncFileItemPtr& item);
+    void slotItemCompleted(const SyncFileItem& item, const PropagatorJob & job);
    void slotFinished(bool success);
    void slotProgress(const SyncFileItem& item, quint64 curent);
    void slotDiscoveryJobFinished(int updateResult);
@@ -173,13 +180,13 @@ private:

    // Cleans up unnecessary downloadinfo entries in the journal as well
    // as their temporary files.
-    void deleteStaleDownloadInfos(const SyncFileItemVector &syncItems);
+    void deleteStaleDownloadInfos();

    // Removes stale uploadinfos from the journal.
-    void deleteStaleUploadInfos(const SyncFileItemVector &syncItems);
+    void deleteStaleUploadInfos();

    // Removes stale error blacklist entries from the journal.
-    void deleteStaleErrorBlacklistEntries(const SyncFileItemVector &syncItems);
+    void deleteStaleErrorBlacklistEntries();

    // cleanup and emit the finished signal
    void finalize(bool success);
@@ -189,6 +196,10 @@ private:
    // Must only be acessed during update and reconcile
    QMap<QString, SyncFileItemPtr> _syncItemMap;

+    // should be called _syncItems (present tense). It's the items from the _syncItemMap but
+    // sorted and re-adjusted based on permissions.
+    SyncFileItemVector _syncedItems;
+
    AccountPtr _account;
    CSYNC *_csync_ctx;
    bool _needsUpdate;
@@ -230,13 +241,13 @@ private:
     * check if we are allowed to propagate everything, and if we are not, adjust the instructions
     * to recover
     */
-    void checkForPermission(SyncFileItemVector &syncItems);
+    void checkForPermission();
    QByteArray getPermissions(const QString& file) const;

    /**
     * Instead of downloading files from the server, upload the files to the server
     */
-    void restoreOldFiles(SyncFileItemVector &syncItems);
+    void restoreOldFiles();

    bool _hasNoneFiles; // true if there is at least one file which was not changed on the server
    bool _hasRemoveFile; // true if there is at leasr one file with instruction REMOVE
@@ -246,7 +257,8 @@ private:

    int _uploadLimit;
    int _downloadLimit;
-    SyncOptions _syncOptions;
+    /* maximum size a folder can have without asking for confirmation: -1 means infinite */
+    qint64 _newBigFolderSizeLimit;

    // hash containing the permissions on the remote directory
    QHash<QString, QByteArray> _remotePerms;
@@ -68,7 +68,7 @@ public:
         _serverHasIgnoredFiles(false), _hasBlacklistEntry(false),
         _errorMayBeBlacklisted(false), _status(NoStatus),
        _isRestoration(false),
-        _httpErrorCode(0), _affectedItems(1),
+        _httpErrorCode(0), _requestDuration(0), _affectedItems(1),
        _instruction(CSYNC_INSTRUCTION_NONE), _modtime(0), _size(0), _inode(0)
    {
    }
@@ -160,6 +160,7 @@ public:
    quint16              _httpErrorCode;
    QString              _errorString; // Contains a string only in case of error
    QByteArray           _responseTimeStamp;
+    quint64              _requestDuration;
    quint32              _affectedItems; // the number of affected items by the operation on this item.
     // usually this value is 1, but for removes on dirs, it might be much higher.

@@ -178,10 +179,15 @@ public:
    QString              _directDownloadCookies;

    struct {
+        quint64     _size;
+        time_t      _modtime;
+        QByteArray  _etag;
+        QByteArray  _fileId;
        quint64     _other_size;
        time_t      _other_modtime;
        QByteArray  _other_etag;
        QByteArray  _other_fileId;
+        enum csync_instructions_e _instruction BITFIELD(16);
        enum csync_instructions_e _other_instruction BITFIELD(16);
    } log;
 };
@@ -196,6 +202,5 @@ typedef QVector<SyncFileItemPtr> SyncFileItemVector;
 }

 Q_DECLARE_METATYPE(OCC::SyncFileItem)
-Q_DECLARE_METATYPE(OCC::SyncFileItemPtr)

 #endif // SYNCFILEITEM_H
@@ -77,8 +77,8 @@ SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine)
 {
    connect(syncEngine, SIGNAL(aboutToPropagate(SyncFileItemVector&)),
            SLOT(slotAboutToPropagate(SyncFileItemVector&)));
-    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItemPtr&)),
-            SLOT(slotItemCompleted(const SyncFileItemPtr&)));
+    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItem&, const PropagatorJob&)),
+            SLOT(slotItemCompleted(const SyncFileItem&)));
    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncFinished()));
    connect(syncEngine, SIGNAL(started()), SLOT(slotSyncEngineRunningChanged()));
    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncEngineRunningChanged()));
@@ -223,28 +223,28 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
    }
 }

-void SyncFileStatusTracker::slotItemCompleted(const SyncFileItemPtr &item)
+void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
 {
    // qDebug() << Q_FUNC_INFO << item.destination() << item._status << item._instruction;

-    if (showErrorInSocketApi(*item)) {
-        _syncProblems[item->_file] = SyncFileStatus::StatusError;
-        invalidateParentPaths(item->destination());
-    } else if (showWarningInSocketApi(*item)) {
-        _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
+    if (showErrorInSocketApi(item)) {
+        _syncProblems[item._file] = SyncFileStatus::StatusError;
+        invalidateParentPaths(item.destination());
+    } else if (showWarningInSocketApi(item)) {
+        _syncProblems[item._file] = SyncFileStatus::StatusWarning;
    } else {
-        _syncProblems.erase(item->_file);
+        _syncProblems.erase(item._file);
    }

-    SharedFlag sharedFlag = item->_remotePerm.contains("S") ? Shared : NotShared;
-    if (item->_instruction != CSYNC_INSTRUCTION_NONE
-        && item->_instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
-        && item->_instruction != CSYNC_INSTRUCTION_IGNORE
-        && item->_instruction != CSYNC_INSTRUCTION_ERROR) {
+    SharedFlag sharedFlag = item._remotePerm.contains("S") ? Shared : NotShared;
+    if (item._instruction != CSYNC_INSTRUCTION_NONE
+        && item._instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
+        && item._instruction != CSYNC_INSTRUCTION_IGNORE
+        && item._instruction != CSYNC_INSTRUCTION_ERROR) {
        // decSyncCount calls *must* be symetric with incSyncCount calls in slotAboutToPropagate
-        decSyncCountAndEmitStatusChanged(item->destination(), sharedFlag);
+        decSyncCountAndEmitStatusChanged(item.destination(), sharedFlag);
    } else {
-        emit fileStatusChanged(getSystemDestination(item->destination()), resolveSyncAndErrorStatus(item->destination(), sharedFlag));
+        emit fileStatusChanged(getSystemDestination(item.destination()), resolveSyncAndErrorStatus(item.destination(), sharedFlag));
    }
 }

@@ -46,7 +46,7 @@ signals:

 private slots:
    void slotAboutToPropagate(SyncFileItemVector& items);
-    void slotItemCompleted(const SyncFileItemPtr& item);
+    void slotItemCompleted(const SyncFileItem& item);
    void slotSyncFinished();
    void slotSyncEngineRunningChanged();

@@ -1370,22 +1370,21 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
    }
 }

-QVector<uint> SyncJournalDb::deleteStaleUploadInfos(const QSet<QString> &keep)
+bool SyncJournalDb::deleteStaleUploadInfos(const QSet<QString> &keep)
 {
    QMutexLocker locker(&_mutex);
-    QVector<uint> ids;

    if (!checkConnect()) {
-        return ids;
+        return false;
    }

    SqlQuery query(_db);
-    query.prepare("SELECT path,transferid FROM uploadinfo");
+    query.prepare("SELECT path FROM uploadinfo");

    if (!query.exec()) {
        QString err = query.error();
        qDebug() << "Error creating prepared statement: " << query.lastQuery() << ", Error:" << err;
-        return ids;
+        return false;
    }

    QStringList superfluousPaths;
@@ -1394,12 +1393,10 @@ QVector<uint> SyncJournalDb::deleteStaleUploadInfos(const QSet<QString> &keep)
        const QString file = query.stringValue(0);
        if (!keep.contains(file)) {
            superfluousPaths.append(file);
-            ids.append(query.intValue(1));
        }
    }

-    deleteBatch(*_deleteUploadInfoQuery, superfluousPaths, "uploadinfo");
-    return ids;
+    return deleteBatch(*_deleteUploadInfoQuery, superfluousPaths, "uploadinfo");
 }

 SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry( const QString& file )
@@ -105,8 +105,7 @@ public:

    UploadInfo getUploadInfo(const QString &file);
    void setUploadInfo(const QString &file, const UploadInfo &i);
-    // Return the list of transfer ids that were removed.
-    QVector<uint> deleteStaleUploadInfos(const QSet<QString>& keep);
+    bool deleteStaleUploadInfos(const QSet<QString>& keep);

    SyncJournalErrorBlacklistRecord errorBlacklistEntry( const QString& );
    bool deleteStaleErrorBlacklistEntries(const QSet<QString>& keep);
@@ -13,22 +13,19 @@
 */

 #include "syncresult.h"
-#include "progressdispatcher.h"

 namespace OCC
 {

 SyncResult::SyncResult()
-    : _status( Undefined )
-    , _foundFilesNotSynced(false)
-    , _folderStructureWasChanged(false)
-    , _numNewItems(0)
-    , _numRemovedItems(0)
-    , _numUpdatedItems(0)
-    , _numRenamedItems(0)
-    , _numConflictItems(0)
-    , _numErrorItems(0)
+    : _status( Undefined ),
+      _warnCount(0)
+{
+}

+SyncResult::SyncResult(SyncResult::Status status )
+    : _status(status),
+      _warnCount(0)
 {
 }

@@ -37,11 +34,6 @@ SyncResult::Status SyncResult::status() const
    return _status;
 }

-void SyncResult::reset()
-{
-    *this = SyncResult();
-}
-
 QString SyncResult::statusString() const
 {
    QString re;
@@ -88,17 +80,42 @@ void SyncResult::setStatus( Status stat )
    _syncTime = QDateTime::currentDateTime();
 }

+void SyncResult::setSyncFileItemVector( const SyncFileItemVector& items )
+{
+    _syncItems = items;
+}
+
+SyncFileItemVector SyncResult::syncFileItemVector() const
+{
+    return _syncItems;
+}
+
 QDateTime SyncResult::syncTime() const
 {
    return _syncTime;
 }

+void SyncResult::setWarnCount(int wc)
+{
+    _warnCount = wc;
+}
+
+int SyncResult::warnCount() const
+{
+    return _warnCount;
+}
+
+void SyncResult::setErrorStrings( const QStringList& list )
+{
+    _errors = list;
+}
+
 QStringList SyncResult::errorStrings() const
 {
    return _errors;
 }

-void SyncResult::appendErrorString( const QString& err )
+void SyncResult::setErrorString( const QString& err )
 {
    _errors.append( err );
 }
@@ -124,68 +141,8 @@ QString SyncResult::folder() const
    return _folder;
 }

-void SyncResult::processCompletedItem(const SyncFileItemPtr &item)
+SyncResult::~SyncResult()
 {
-    if (Progress::isWarningKind(item->_status)) {
-        // Count any error conditions, error strings will have priority anyway.
-        _foundFilesNotSynced = true;
-    }
-
-    if (item->_isDirectory && (item->_instruction == CSYNC_INSTRUCTION_NEW
-            || item->_instruction == CSYNC_INSTRUCTION_TYPE_CHANGE
-            || item->_instruction == CSYNC_INSTRUCTION_REMOVE
-            || item->_instruction == CSYNC_INSTRUCTION_RENAME)) {
-        _folderStructureWasChanged = true;
-    }
-
-    // Process the item to the gui
-    if( item->_status == SyncFileItem::FatalError || item->_status == SyncFileItem::NormalError ) {
-        //: this displays an error string (%2) for a file %1
-        appendErrorString( QObject::tr("%1: %2").arg(item->_file, item->_errorString) );
-        _numErrorItems++;
-        if (!_firstItemError) {
-            _firstItemError = item;
-        }
-    } else if( item->_status == SyncFileItem::Conflict ) {
-        _numConflictItems++;
-        if (!_firstConflictItem) {
-            _firstConflictItem = item;
-        }
-    } else {
-        if (!item->hasErrorStatus() && item->_status != SyncFileItem::FileIgnored && item->_direction == SyncFileItem::Down) {
-            switch (item->_instruction) {
-            case CSYNC_INSTRUCTION_NEW:
-            case CSYNC_INSTRUCTION_TYPE_CHANGE:
-                _numNewItems++;
-                if (!_firstItemNew)
-                    _firstItemNew = item;
-                break;
-            case CSYNC_INSTRUCTION_REMOVE:
-                _numRemovedItems++;
-                if (!_firstItemDeleted)
-                    _firstItemDeleted = item;
-                break;
-            case CSYNC_INSTRUCTION_SYNC:
-                _numUpdatedItems++;
-                if (!_firstItemUpdated)
-                    _firstItemUpdated = item;
-                break;
-            case CSYNC_INSTRUCTION_RENAME:
-                if (!_firstItemRenamed) {
-                    _firstItemRenamed = item;
-                }
-                _numRenamedItems++;
-                break;
-            default:
-                // nothing.
-                break;
-            }
-        } else if( item->_direction == SyncFileItem::None ) {
-            if( item->_instruction == CSYNC_INSTRUCTION_IGNORE ) {
-                _foundFilesNotSynced = true;
-            }
-        }
-    }

 }

@@ -47,13 +47,20 @@ public:
    };

    SyncResult();
-    void reset();
-
-    void    appendErrorString( const QString& );
+    SyncResult( Status status );
+    ~SyncResult();
+    void    setErrorString( const QString& );
+    void    setErrorStrings( const QStringList& );
    QString errorString() const;
    QStringList errorStrings() const;
+    int     warnCount() const;
+    void    setWarnCount(int wc);
    void    clearErrors();

+    // handle a list of changed items.
+    void    setSyncFileItemVector( const SyncFileItemVector& );
+    SyncFileItemVector syncFileItemVector() const;
+
    void setStatus( Status );
    Status status() const;
    QString statusString() const;
@@ -61,25 +68,6 @@ public:
    void setFolder(const QString& folder);
    QString folder() const;

-    bool foundFilesNotSynced() const { return _foundFilesNotSynced; }
-    bool folderStructureWasChanged() const { return _folderStructureWasChanged; }
-
-    int numNewItems() const { return _numNewItems; }
-    int numRemovedItems() const { return _numRemovedItems; }
-    int numUpdatedItems() const { return _numUpdatedItems; }
-    int numRenamedItems() const { return _numRenamedItems; }
-    int numConflictItems() const { return _numConflictItems; }
-    int numErrorItems() const { return _numErrorItems; }
-
-    const SyncFileItemPtr& firstItemNew() const { return _firstItemNew; }
-    const SyncFileItemPtr& firstItemDeleted() const { return _firstItemDeleted; }
-    const SyncFileItemPtr& firstItemUpdated() const { return _firstItemUpdated; }
-    const SyncFileItemPtr& firstItemRenamed() const { return _firstItemRenamed; }
-    const SyncFileItemPtr& firstConflictItem() const { return _firstConflictItem; }
-    const SyncFileItemPtr& firstItemError() const { return _firstItemError; }
-
-    void processCompletedItem(const SyncFileItemPtr &item);
-
 private:
    Status             _status;
    SyncFileItemVector _syncItems;
@@ -89,23 +77,7 @@ private:
     * when the sync tool support this...
     */
    QStringList        _errors;
-    bool _foundFilesNotSynced;
-    bool _folderStructureWasChanged;
-
-    // count new, removed and updated items
-    int _numNewItems;
-    int _numRemovedItems;
-    int _numUpdatedItems;
-    int _numRenamedItems;
-    int _numConflictItems;
-    int _numErrorItems;
-
-    SyncFileItemPtr _firstItemNew;
-    SyncFileItemPtr _firstItemDeleted;
-    SyncFileItemPtr _firstItemUpdated;
-    SyncFileItemPtr _firstItemRenamed;
-    SyncFileItemPtr _firstConflictItem;
-    SyncFileItemPtr _firstItemError;
+    int                _warnCount;
 };

 }
@@ -275,15 +275,6 @@ qint64 Theme::newBigFolderSizeLimit() const
    return 500;
 }

-bool Theme::wizardHideExternalStorageConfirmationCheckbox() const
-{
-    return false;
-}
-
-bool Theme::wizardHideFolderSizeLimitCheckbox() const
-{
-    return false;
-}

 QString Theme::gitSHA1() const
 {
@@ -421,7 +412,7 @@ QPixmap Theme::wizardHeaderBanner() const
    if (!c.isValid())
        return QPixmap();

-    QPixmap pix(QSize(750, 78));
+    QPixmap pix(QSize(600, 78));
    pix.fill(wizardHeaderBackgroundColor());
    return pix;
 }
@@ -487,6 +478,4 @@ QString Theme::quotaBaseFolder() const
 {
    return QLatin1String("/");
 }
-
-
 } // end namespace client
@@ -219,17 +219,6 @@ public:
     **/
    virtual qint64 newBigFolderSizeLimit() const;

-    /**
-     * Hide the checkbox that says "Ask for confirmation before synchronizing folders larger than X MB"
-     * in the account wizard
-     */
-    virtual bool wizardHideFolderSizeLimitCheckbox() const;
-    /**
-     * Hide the checkbox that says "Ask for confirmation before synchronizing external storages"
-     * in the account wizard
-     */
-    virtual bool wizardHideExternalStorageConfirmationCheckbox() const;
-
    /**
     * Alternative path on the server that provides access to the webdav capabilities
     *
@@ -313,7 +302,6 @@ public:
     */
    virtual QString quotaBaseFolder() const;

-
 protected:
 #ifndef TOKEN_AUTH_ONLY
    QIcon themeIcon(const QString& name, bool sysTray = false, bool sysTrayMenuVisible = false) const;
@@ -50,7 +50,6 @@ if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
    owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")
    owncloud_add_test(ChunkingNg "syncenginetestutils.h")
    owncloud_add_test(UploadReset "syncenginetestutils.h")
-    owncloud_add_benchmark(LargeSync "syncenginetestutils.h")
 endif(HAVE_QT5 AND NOT BUILD_WITH_QT4)

 SET(FolderMan_SRC ../src/gui/folderman.cpp)
@@ -1,43 +0,0 @@
-/*
- *    This software is in the public domain, furnished "as is", without technical
- *    support, and with no warranty, express or implied, as to its usefulness for
- *    any purpose.
- *
- */
-
-#include "syncenginetestutils.h"
-#include <syncengine.h>
-
-using namespace OCC;
-
-int numDirs = 0;
-int numFiles = 0;
-
-template<int filesPerDir, int dirPerDir, int maxDepth>
-void addBunchOfFiles(int depth, const QString &path, FileModifier &fi) {
-    for (int fileNum = 1; fileNum <= filesPerDir; ++fileNum) {
-        QString name = QStringLiteral("file") + QString::number(fileNum);
-        fi.insert(path.isEmpty() ? name : path + "/" + name);
-        numFiles++;
-    }
-    if (depth >= maxDepth)
-        return;
-    for (char dirNum = 1; dirNum <= dirPerDir; ++dirNum) {
-        QString name = QStringLiteral("dir") + QString::number(dirNum);
-        QString subPath = path.isEmpty() ? name : path + "/" + name;
-        fi.mkdir(subPath);
-        numDirs++;
-        addBunchOfFiles<filesPerDir, dirPerDir, maxDepth>(depth + 1, subPath, fi);
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-    FakeFolder fakeFolder{FileInfo{}};
-    addBunchOfFiles<10, 8, 4>(0, "", fakeFolder.localModifier());
-
-    qDebug() << "NUMFILES" << numFiles;
-    qDebug() << "NUMDIRS" << numDirs;
-    return fakeFolder.syncOnce() ? 0 : -1;
-}
@@ -24,30 +24,3 @@ macro(owncloud_add_test test_class additional_cpp)
    add_definitions(-DOWNCLOUD_BIN_PATH=${CMAKE_BINARY_DIR}/bin)
    add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
 endmacro()
-
-macro(owncloud_add_benchmark test_class additional_cpp)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                        ${QT_INCLUDES}
-                        "${PROJECT_SOURCE_DIR}/src/gui"
-                        "${PROJECT_SOURCE_DIR}/src/libsync"
-                        "${CMAKE_BINARY_DIR}/src/libsync"
-                        "${CMAKE_CURRENT_BINARY_DIR}"
-                       )
-
-    set(CMAKE_AUTOMOC TRUE)
-    set(OWNCLOUD_TEST_CLASS ${test_class})
-    string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
-
-    add_executable(${OWNCLOUD_TEST_CLASS}Bench benchmarks/bench${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Bench Test Sql Xml Network)
-
-    target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
-        updater
-        ${APPLICATION_EXECUTABLE}sync
-        ${QT_QTTEST_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
-    )
-
-    add_definitions(-DOWNCLOUD_TEST)
-    add_definitions(-DOWNCLOUD_BIN_PATH=${CMAKE_BINARY_DIR}/bin)
-endmacro()
@@ -267,15 +267,6 @@ public:
        return (parentPath.isEmpty() ? QString() : (parentPath + '/')) + name;
    }

-    void fixupParentPathRecursively() {
-        auto p = path();
-        for (auto it = children.begin(); it != children.end(); ++it) {
-            Q_ASSERT(it.key() == it->name);
-            it->parentPath = p;
-            it->fixupParentPathRecursively();
-        }
-    }
-
    QString name;
    bool isDir = true;
    bool isShared = false;
@@ -294,6 +285,15 @@ private:
        return find(pathComponents, true);
    }

+    void fixupParentPathRecursively() {
+        auto p = path();
+        for (auto it = children.begin(); it != children.end(); ++it) {
+            Q_ASSERT(it.key() == it->name);
+            it->parentPath = p;
+            it->fixupParentPathRecursively();
+        }
+    }
+
    friend inline QDebug operator<<(QDebug dbg, const FileInfo& fi) {
        return dbg << "{ " << fi.path() << ": " << fi.children;
    }
@@ -315,10 +315,7 @@ public:
        QString fileName = getFilePathFromUrl(request.url());
        Q_ASSERT(!fileName.isNull()); // for root, it should be empty
        const FileInfo *fileInfo = remoteRootFileInfo.find(fileName);
-        if (!fileInfo) {
-            QMetaObject::invokeMethod(this, "respond404", Qt::QueuedConnection);
-            return;
-        }
+        Q_ASSERT(fileInfo);
        QString prefix = request.url().path().left(request.url().path().size() - fileName.size());

        // Don't care about the request and just return a full propfind
@@ -378,13 +375,6 @@ public:
        emit finished();
    }

-    Q_INVOKABLE void respond404() {
-        setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 404);
-        setError(InternalServerError, "Not Found");
-        emit metaDataChanged();
-        emit finished();
-    }
-
    void abort() override { }

    qint64 bytesAvailable() const override { return payload.size() + QIODevice::bytesAvailable(); }
@@ -534,8 +524,7 @@ class FakeGetReply : public QNetworkReply
    Q_OBJECT
 public:
    const FileInfo *fileInfo;
-    char payload;
-    int size;
+    QByteArray payload;

    FakeGetReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
    : QNetworkReply{parent} {
@@ -551,9 +540,8 @@ public:
    }

    Q_INVOKABLE void respond() {
-        payload = fileInfo->contentChar;
-        size = fileInfo->size;
-        setHeader(QNetworkRequest::ContentLengthHeader, size);
+        payload.fill(fileInfo->contentChar, fileInfo->size);
+        setHeader(QNetworkRequest::ContentLengthHeader, payload.size());
        setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
        setRawHeader("OC-ETag", fileInfo->etag.toLatin1());
        setRawHeader("ETag", fileInfo->etag.toLatin1());
@@ -565,12 +553,12 @@ public:
    }

    void abort() override { }
-    qint64 bytesAvailable() const override { return size + QIODevice::bytesAvailable(); }
+    qint64 bytesAvailable() const override { return payload.size() + QIODevice::bytesAvailable(); }

    qint64 readData(char *data, qint64 maxlen) override {
-        qint64 len = std::min(qint64{size}, maxlen);
-        std::fill_n(data, len, payload);
-        size -= len;
+        qint64 len = std::min(qint64{payload.size()}, maxlen);
+        strncpy(data, payload.constData(), len);
+        payload.remove(0, len);
        return len;
    }
 };
@@ -598,7 +586,7 @@ public:
        Q_ASSERT(sourceFolder->isDir);
        int count = 0;
        int size = 0;
-        char payload = '\0';
+        char payload = '*';

        do {
            QString chunkName = QString::number(count).rightJustified(8, '0');
@@ -608,7 +596,6 @@ public:
            Q_ASSERT(!x.isDir);
            Q_ASSERT(x.size > 0); // There should not be empty chunks
            size += x.size;
-            Q_ASSERT(!payload || payload == x.contentChar);
            payload = x.contentChar;
            ++count;
        } while(true);
@@ -620,12 +607,7 @@ public:
        Q_ASSERT(!fileName.isEmpty());

        if ((fileInfo = remoteRootFileInfo.find(fileName))) {
-            QVERIFY(request.hasRawHeader("If")); // The client should put this header
-            if (request.rawHeader("If") != QByteArray("<" + request.rawHeader("Destination") +
-                                                "> ([\"" + fileInfo->etag.toLatin1() + "\"])")) {
-                QMetaObject::invokeMethod(this, "respondPreconditionFailed", Qt::QueuedConnection);
-                return;
-            }
+            QCOMPARE(request.rawHeader("If"), QByteArray("<" + request.rawHeader("Destination") + "> ([\"" + fileInfo->etag.toLatin1() + "\"])"));
            fileInfo->size = size;
            fileInfo->contentChar = payload;
        } else {
@@ -650,13 +632,6 @@ public:
        emit finished();
    }

-    Q_INVOKABLE void respondPreconditionFailed() {
-        setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 412);
-        setError(InternalServerError, "Precondition Failed");
-        emit metaDataChanged();
-        emit finished();
-    }
-
    void abort() override { }
    qint64 readData(char *, qint64) override { return 0; }
 };
@@ -791,7 +766,6 @@ public:
        QDir rootDir{_tempDir.path()};
        FileInfo rootTemplate;
        fromDisk(rootDir, rootTemplate);
-        rootTemplate.fixupParentPathRecursively();
        return rootTemplate;
    }

@@ -818,15 +792,15 @@ public:
    }

    void execUntilItemCompleted(const QString &relativePath) {
-        QSignalSpy spy(_syncEngine.get(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy spy(_syncEngine.get(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        QElapsedTimer t;
        t.start();
        while (t.elapsed() < 5000) {
            spy.clear();
            QVERIFY(spy.wait());
            for(const QList<QVariant> &args : spy) {
-                auto item = args[0].value<OCC::SyncFileItemPtr>();
-                if (item->destination() == relativePath)
+                auto item = args[0].value<OCC::SyncFileItem>();
+                if (item.destination() == relativePath)
                    return;
            }
        }
@@ -835,7 +809,7 @@ public:

    bool execUntilFinished() {
        QSignalSpy spy(_syncEngine.get(), SIGNAL(finished(bool)));
-        bool ok = spy.wait(3600000);
+        bool ok = spy.wait(60000);
        Q_ASSERT(ok && "Sync timed out");
        return spy[0][0].toBool();
    }
@@ -868,8 +842,8 @@ private:
            if (diskChild.isDir()) {
                QDir subDir = dir;
                subDir.cd(diskChild.fileName());
-                FileInfo &subFi = templateFi.children[diskChild.fileName()] = FileInfo{diskChild.fileName()};
-                fromDisk(subDir, subFi);
+                templateFi.children.insert(diskChild.fileName(), FileInfo{diskChild.fileName()});
+                fromDisk(subDir, templateFi.children.last());
            } else {
                QFile f{diskChild.filePath()};
                f.open(QFile::ReadOnly);
@@ -11,36 +11,6 @@

 using namespace OCC;

-/* Upload a 1/3 of a file of given size.
- * fakeFolder needs to be synchronized */
-static void partialUpload(FakeFolder &fakeFolder, const QString &name, int size)
-{
-    QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-    QCOMPARE(fakeFolder.uploadState().children.count(), 0); // The state should be clean
-
-    fakeFolder.localModifier().insert(name, size);
-    // Abort when the upload is at 1/3
-    int sizeWhenAbort = -1;
-    auto con = QObject::connect(&fakeFolder.syncEngine(),  &SyncEngine::transmissionProgress,
-                                    [&](const ProgressInfo &progress) {
-                if (progress.completedSize() > (progress.totalSize() /3 )) {
-                    sizeWhenAbort = progress.completedSize();
-                    fakeFolder.syncEngine().abort();
-                }
-    });
-
-    QVERIFY(!fakeFolder.syncOnce()); // there should have been an error
-    QObject::disconnect(con);
-    QVERIFY(sizeWhenAbort > 0);
-    QVERIFY(sizeWhenAbort < size);
-
-    QCOMPARE(fakeFolder.uploadState().children.count(), 1); // the transfer was done with chunking
-    auto upStateChildren = fakeFolder.uploadState().children.first().children;
-    QCOMPARE(sizeWhenAbort, std::accumulate(upStateChildren.cbegin(), upStateChildren.cend(), 0,
-                                            [](int s, const FileInfo &i) { return s + i.size; }));
-}
-
-
 class TestChunkingNG : public QObject
 {
    Q_OBJECT
@@ -70,173 +40,38 @@ private slots:
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
        const int size = 300 * 1000 * 1000; // 300 MB
-        partialUpload(fakeFolder, "A/a0", size);
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        auto chunkingId = fakeFolder.uploadState().children.first().name;
+        fakeFolder.localModifier().insert("A/a0", size);
+
+        // Abort when the upload is at 1/3
+        int sizeWhenAbort = -1;
+        auto con = QObject::connect(&fakeFolder.syncEngine(),  &SyncEngine::transmissionProgress,
+                                    [&](const ProgressInfo &progress) {
+                if (progress.completedSize() > (progress.totalSize() /3 )) {
+                    sizeWhenAbort = progress.completedSize();
+                    fakeFolder.syncEngine().abort();
+                }
+        });
+
+        QVERIFY(!fakeFolder.syncOnce()); // there should have been an error
+        QObject::disconnect(con);
+        QVERIFY(sizeWhenAbort > 0);
+        QVERIFY(sizeWhenAbort < size);
+        QCOMPARE(fakeFolder.uploadState().children.count(), 1); // the transfer was done with chunking
+        auto upStateChildren = fakeFolder.uploadState().children.first().children;
+        QCOMPARE(sizeWhenAbort, std::accumulate(upStateChildren.cbegin(), upStateChildren.cend(), 0,
+                                               [](int s, const FileInfo &i) { return s + i.size; }));
+

        // Add a fake file to make sure it gets deleted
        fakeFolder.uploadState().children.first().insert("10000", size);
        QVERIFY(fakeFolder.syncOnce());

+
+
        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
+        QCOMPARE(fakeFolder.uploadState().children.count(), 1); // The same chunk id was re-used
        QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size);
-        // The same chunk id was re-used
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        QCOMPARE(fakeFolder.uploadState().children.first().name, chunkingId);
    }
-
-    // We modify the file locally after it has been partially uploaded
-    void testRemoveStale1() {
-
-        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
-        const int size = 300 * 1000 * 1000; // 300 MB
-        partialUpload(fakeFolder, "A/a0", size);
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        auto chunkingId = fakeFolder.uploadState().children.first().name;
-
-
-        fakeFolder.localModifier().setContents("A/a0", 'B');
-        fakeFolder.localModifier().appendByte("A/a0");
-
-        QVERIFY(fakeFolder.syncOnce());
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-        QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size + 1);
-        // A different chunk id was used, and the previous one is removed
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        QVERIFY(fakeFolder.uploadState().children.first().name != chunkingId);
-    }
-
-    // We remove the file locally after it has been partially uploaded
-    void testRemoveStale2() {
-
-        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
-        const int size = 300 * 1000 * 1000; // 300 MB
-        partialUpload(fakeFolder, "A/a0", size);
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-
-        fakeFolder.localModifier().remove("A/a0");
-
-        QVERIFY(fakeFolder.syncOnce());
-        QCOMPARE(fakeFolder.uploadState().children.count(), 0);
-    }
-
-
-    void testCreateConflictWhileSyncing() {
-        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
-        const int size = 150 * 1000 * 1000; // 150 MB
-
-        // Put a file on the server and download it.
-        fakeFolder.remoteModifier().insert("A/a0", size);
-        QVERIFY(fakeFolder.syncOnce());
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-
-        // Modify the file localy and start the upload
-        fakeFolder.localModifier().setContents("A/a0", 'B');
-        fakeFolder.localModifier().appendByte("A/a0");
-
-        // But in the middle of the sync, modify the file on the server
-        QMetaObject::Connection con = QObject::connect(&fakeFolder.syncEngine(), &SyncEngine::transmissionProgress,
-                                    [&](const ProgressInfo &progress) {
-                if (progress.completedSize() > (progress.totalSize() / 2 )) {
-                    fakeFolder.remoteModifier().setContents("A/a0", 'C');
-                    QObject::disconnect(con);
-                }
-        });
-
-        QVERIFY(!fakeFolder.syncOnce());
-        // There was a precondition failed error, this means wen need to sync again
-        QCOMPARE(fakeFolder.syncEngine().isAnotherSyncNeeded(), ImmediateFollowUp);
-
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1); // We did not clean the chunks at this point
-
-        // Now we will download the server file and create a conflict
-        QVERIFY(fakeFolder.syncOnce());
-        auto localState = fakeFolder.currentLocalState();
-
-        // A0 is the one from the server
-        QCOMPARE(localState.find("A/a0")->size, size);
-        QCOMPARE(localState.find("A/a0")->contentChar, 'C');
-
-        // There is a conflict file with our version
-        auto &stateAChildren = localState.find("A")->children;
-        auto it = std::find_if(stateAChildren.cbegin(), stateAChildren.cend(), [&](const FileInfo &fi) {
-            return fi.name.startsWith("a0_conflict");
-        });
-        QVERIFY(it != stateAChildren.cend());
-        QCOMPARE(it->contentChar, 'B');
-        QCOMPARE(it->size, size+1);
-
-        // Remove the conflict file so the comparison works!
-        fakeFolder.localModifier().remove("A/" + it->name);
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-
-        QCOMPARE(fakeFolder.uploadState().children.count(), 0); // The last sync cleaned the chunks
-    }
-
-    void testModifyLocalFileWhileUploading() {
-
-        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
-        const int size = 150 * 1000 * 1000; // 150 MB
-
-        fakeFolder.localModifier().insert("A/a0", size);
-
-        // middle of the sync, modify the file
-        QMetaObject::Connection con = QObject::connect(&fakeFolder.syncEngine(), &SyncEngine::transmissionProgress,
-                                    [&](const ProgressInfo &progress) {
-                if (progress.completedSize() > (progress.totalSize() / 2 )) {
-                    fakeFolder.localModifier().setContents("A/a0", 'B');
-                    fakeFolder.localModifier().appendByte("A/a0");
-                    QObject::disconnect(con);
-                }
-        });
-
-        QVERIFY(!fakeFolder.syncOnce());
-
-        // There should be a followup sync
-        QCOMPARE(fakeFolder.syncEngine().isAnotherSyncNeeded(), ImmediateFollowUp);
-
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1); // We did not clean the chunks at this point
-        auto chunkingId = fakeFolder.uploadState().children.first().name;
-
-        // Now we make a new sync which should upload the file for good.
-        QVERIFY(fakeFolder.syncOnce());
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-        QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size+1);
-
-        // A different chunk id was used, and the previous one is removed
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        QVERIFY(fakeFolder.uploadState().children.first().name != chunkingId);
-    }
-
-
-    void testResumeServerDeletedChunks() {
-
-        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } });
-        const int size = 300 * 1000 * 1000; // 300 MB
-        partialUpload(fakeFolder, "A/a0", size);
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        auto chunkingId = fakeFolder.uploadState().children.first().name;
-
-        // Delete the chunks on the server
-        fakeFolder.uploadState().children.clear();
-        QVERIFY(fakeFolder.syncOnce());
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-        QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size);
-
-        // A different chunk id was used
-        QCOMPARE(fakeFolder.uploadState().children.count(), 1);
-        QVERIFY(fakeFolder.uploadState().children.first().name != chunkingId);
-    }
-
 };

 QTEST_GUILESS_MAIN(TestChunkingNG)
@@ -14,8 +14,8 @@ using namespace OCC;
 bool itemDidComplete(const QSignalSpy &spy, const QString &path)
 {
    for(const QList<QVariant> &args : spy) {
-        auto item = args[0].value<SyncFileItemPtr>();
-        if (item->destination() == path)
+        SyncFileItem item = args[0].value<SyncFileItem>();
+        if (item.destination() == path)
            return true;
    }
    return false;
@@ -24,9 +24,9 @@ bool itemDidComplete(const QSignalSpy &spy, const QString &path)
 bool itemDidCompleteSuccessfully(const QSignalSpy &spy, const QString &path)
 {
    for(const QList<QVariant> &args : spy) {
-        auto item = args[0].value<SyncFileItemPtr>();
-        if (item->destination() == path)
-            return item->_status == SyncFileItem::Success;
+        SyncFileItem item = args[0].value<SyncFileItem>();
+        if (item.destination() == path)
+            return item._status == SyncFileItem::Success;
    }
    return false;
 }
@@ -38,7 +38,7 @@ class TestSyncEngine : public QObject
 private slots:
    void testFileDownload() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.remoteModifier().insert("A/a0");
        fakeFolder.syncOnce();
        QVERIFY(itemDidCompleteSuccessfully(completeSpy, "A/a0"));
@@ -47,7 +47,7 @@ private slots:

    void testFileUpload() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.localModifier().insert("A/a0");
        fakeFolder.syncOnce();
        QVERIFY(itemDidCompleteSuccessfully(completeSpy, "A/a0"));
@@ -56,7 +56,7 @@ private slots:

    void testDirDownload() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.remoteModifier().mkdir("Y");
        fakeFolder.remoteModifier().mkdir("Z");
        fakeFolder.remoteModifier().insert("Z/d0");
@@ -69,7 +69,7 @@ private slots:

    void testDirUpload() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.localModifier().mkdir("Y");
        fakeFolder.localModifier().mkdir("Z");
        fakeFolder.localModifier().insert("Z/d0");
@@ -82,7 +82,7 @@ private slots:

    void testLocalDelete() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.remoteModifier().remove("A/a1");
        fakeFolder.syncOnce();
        QVERIFY(itemDidCompleteSuccessfully(completeSpy, "A/a1"));
@@ -91,7 +91,7 @@ private slots:

    void testRemoteDelete() {
        FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        fakeFolder.localModifier().remove("A/a1");
        fakeFolder.syncOnce();
        QVERIFY(itemDidCompleteSuccessfully(completeSpy, "A/a1"));
@@ -107,7 +107,7 @@ private slots:
        // fakeFolder.syncOnce();
        fakeFolder.syncOnce();

-        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+        QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
        // Touch the file without changing the content, shouldn't upload
        fakeFolder.localModifier().setContents("a1.eml", 'A');
        // Change the content/size
@@ -204,7 +204,7 @@ private slots:
            QCOMPARE(fakeFolder.currentLocalState(), remoteState);

            expectedServerState = fakeFolder.currentRemoteState();
-            QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &)));
+            QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
            fakeFolder.syncOnce(); // This sync should do nothing
            QCOMPARE(completeSpy.count(), 0);

@@ -213,17 +213,6 @@ private slots:
        }
    }

-    void abortAfterFailedMkdir() {
-        FakeFolder fakeFolder{FileInfo{}};
-        QSignalSpy finishedSpy(&fakeFolder.syncEngine(), SIGNAL(finished(bool)));
-        fakeFolder.serverErrorPaths().append("NewFolder");
-        fakeFolder.localModifier().mkdir("NewFolder");
-        // This should be aborted and would otherwise fail in FileInfo::create.
-        fakeFolder.localModifier().insert("NewFolder/NewFile");
-        fakeFolder.syncOnce();
-        QCOMPARE(finishedSpy.size(), 1);
-        QCOMPARE(finishedSpy.first().first().toBool(), false);
-    }
 };

 QTEST_GUILESS_MAIN(TestSyncEngine)
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Místní adresář %1 neexistuje.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 by měl být adresář, ale není.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 není čitelný.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 byl odebrán.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 byl stažen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 byl aktualizován.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 byl přejmenován na %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 byl přemístěn do %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Průběh synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Nezdařilo se přečtení systémového exclude souboru</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Byl přidán nový adresář %2 větší než %1 MB.
 Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,22 +725,22 @@ Toto může být způsobeno změnou v nastavení synchronizace adresáře nebo t
 Opravdu chcete provést tuto akci?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Odstranit všechny soubory?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Odstranit všechny soubory</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Ponechat soubory</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -743,17 +749,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru.
 Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Záloha nalezena</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normální synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Ponechat místní soubory jako konflikt</translation>
    </message>
@@ -761,112 +767,112 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Nelze obnovit stav adresáře</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Byl nalezen starý záznam synchronizace &apos;%1&apos;, ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation> (záloha)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation> (záloha %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Nedefinovaný stav.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Čeká na spuštění synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Příprava na synchronizaci.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Synchronizace probíhá.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Poslední synchronizace byla úspěšná.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Chyba nastavení.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Zrušení uživatelem.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synchronizace pozastavena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronizace je pozastavena)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Nebyl vybrán platný adresář!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Vybraná cesta nevede do adresáře!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Místní adresář %1 je již obsažen ve adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu je již obsažen v adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
    </message>
@@ -1026,12 +1032,12 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Přidat synchronizaci adresáře</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Přidat synchronizační připojení</translation>
    </message>
@@ -1107,6 +1113,14 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
        <translation>Již synchronizujete všechny své soubory. Synchronizování dalšího adresáře &lt;b&gt;není&lt;/b&gt; podporováno. Pokud chcete synchronizovat více adresářů, odstraňte prosím synchronizaci aktuálního kořenového adresáře.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Výběr synchronizace: Můžete dodatečně označit podadresáře, které si nepřejete synchronizovat.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1937,7 +1951,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -1965,27 +1979,27 @@ Nedoporučuje se jí používat.</translation>
        <translation>Soubor byl smazán ze serveru</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Soubor nemohl být kompletně stažen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Soubor se mezitím změnil</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2071,7 +2085,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Soubor byl odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Server vrátil neplatný HTTP kód. Očekáván 204, ale obdržen &quot;%1 %2&quot;.</translation>
    </message>
@@ -2084,7 +2098,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2107,13 +2121,13 @@ Nedoporučuje se jí používat.</translation>
        <translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2121,22 +2135,22 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Soubor odebrán</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Místní soubor se během synchronizace změnil. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Místní soubor byl změněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2144,32 +2158,32 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Místní soubor byl odstraněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Místní soubor byl změněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Neočekávaný návratový kód ze serveru (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>Chybějící souborové ID ze serveru</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>Chybějící ETag ze serveru</translation>
    </message>
@@ -2177,32 +2191,32 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Chybí adresa URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Místní soubor byl odstraněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Místní soubor byl změněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
    </message>
@@ -2220,42 +2234,42 @@ Nedoporučuje se jí používat.</translation>
        <translation>Textový popisek</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Adresář</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Akce</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Velikost</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Místní protokol synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopie</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopírovat záznam aktivity do schránky.</translation>
    </message>
@@ -2296,41 +2310,51 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Neoznačené adresáře budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Výběr synchronizace: Označte vzdálené podadresáře, které si přejete synchronizovat.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Výběr synchronizace: Odznačte vzdálené podadresáře, které si nepřejete synchronizovat.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Vybrat co synchronizovat</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Načítám ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Název</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Velikost</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Na serveru nejsou momentálně žádné podadresáře.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
    </message>
@@ -2843,285 +2867,285 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Úspěch.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>Nezdařilo se načtení žurnálovacího souboru CSync. Žurnálovací soubor je poškozený.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Plugin %1 pro csync nelze načíst.&lt;br/&gt;Zkontrolujte prosím instalaci!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync obdrželo chybu při zpracování vnitřních struktur.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync se nezdařilo rezervovat paměť.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync: kritická chyba parametrů.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync se nezdařilo zpracovat krok aktualizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync se nezdařilo zpracovat krok sladění.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync se nemohlo přihlásit k proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync se nezdařilo najít proxy server nebo cílový server.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync se nezdařilo přihlásit k serveru %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync se nezdařilo připojit k síti.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Došlo k vypršení časového limitu síťového spojení.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Nastala chyba HTTP přenosu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Připojený adresář je na serveru dočasně nedostupný</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Došlo k chybě při otvírání adresáře</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Chyba při čtení adresáře.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvořit nadřazený adresář</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Nedostatek volného místa na serveru %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Nespecifikovaná chyba CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Zrušeno uživatelem</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>Selhal přístup pro CSync</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis do místního adresáře synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync selhalo z důvodu nezpracovaného zamítnutí oprávnění.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync se pokusil vytvořit adresář, který již existuje.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Služba je dočasně nedostupná</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Přístup je zakázán</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Došlo k interní chybě číslo %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Soubor se nachází na seznamu ignorovaných.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>Jméno souboru obsahuje mezery na konci řádky.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Jméno souboru je moc dlouhé.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat selhal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Kódování znaků jména soubor je neplatné</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Neplatné znaky, prosím přejmenujte &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nemohu inicializovat synchronizační žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Nelze načíst blacklist z místní databáze</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Nelze číst ze žurnálu synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Nelze otevřít synchronizační žurnál</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorováno podle nastavení &quot;vybrat co synchronizovat&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranění není povoleno, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Přesun není povolen, položka obnovena</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>cílové umístění</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -3633,12 +3657,6 @@ Nedoporučuje se jí používat.</translation>
        <source>Some time ago</source>
        <translation>Před nějakým časem</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -604,112 +604,118 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokales Verzeichnis %1 existiert nicht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 ist nicht lesbar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde heruntergeladen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde aktualisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 wurde in %2 umbenannt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 wurde in %2 verschoben.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Synchronisierungsaktivität</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -718,22 +724,22 @@ Die Ursache ist, dass der Ordner entweder neu konfiguriert wurde, oder weil alle
 Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Alle Dateien löschen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Lösche alle Dateien</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Dateien behalten</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -742,17 +748,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt
 Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Backup erkannt</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normale Synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Lokale Konfliktdateien behalten</translation>
    </message>
@@ -760,112 +766,112 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(Sicherung)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(Sicherung %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Undefinierter Zustand.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Wartet auf Beginn der Synchronistation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisation wird vorbereitet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Synchronisation läuft.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Die letzte Synchronisation war erfolgreich.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Installationsfehler.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Benutzer-Abbruch</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synchronisation wurde angehalten.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisation ist pausiert)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Kein gültige Ordner gewählt!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Der gewählte Pfad ist kein Ordner!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation>Der lokale Ordner %1 beinhaltet einen symbolischer Link. Das Ziel des Links beinhaltet bereits einen synchronisierten Ordner. Bitte wählen Sie einen anderen lokalen Ordner aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation>Es exisitiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wählen Sie ein anderes lokales Verzeichnis!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links liegt in einem Ordner, der schon synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
    </message>
@@ -1025,12 +1031,12 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
@@ -1106,6 +1112,14 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird &lt;b&gt;nicht&lt;/b&gt; unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Zu synchronisierende Elemente auswählen: Sie können optional Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1935,7 +1949,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -1963,27 +1977,27 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die Datei wurde vom Server gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1  als Größe übermittelt hat.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Datei ist seit der Entdeckung geändert worden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2069,7 +2083,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 204, aber gesendet wurde &quot;%1 %2&quot;.</translation>
    </message>
@@ -2082,7 +2096,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2105,13 +2119,13 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2119,22 +2133,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2142,32 +2156,32 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT &lt; 5.4.2 wird erzwungen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Unerwarteter Rückgabe-Code Antwort vom Server (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>Fehlende Datei-ID vom Server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>Fehlender ETag vom Server</translation>
    </message>
@@ -2175,32 +2189,32 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT &lt; 5.4.2 wird erzwungen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
    </message>
@@ -2218,42 +2232,42 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Zeit</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Datei</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Ordner</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Aktion</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Lokales Sychronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
    </message>
@@ -2294,41 +2308,51 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem &lt;b&gt;entfernt&lt;/b&gt; und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers auswählen, die synchronisiert werden sollen.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Zu synchronisierende Elemente auswählen</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Laden…</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation>Entfernte Ordner abwählen, die nicht synchronisiert werden sollen.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Name</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
    </message>
@@ -2841,285 +2865,285 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Erfolgreich</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync konnte die Journaldatei nicht laden. Die Journaldatei ist beschädigt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Das %1-Plugin für csync konnte nicht geladen werden.&lt;br/&gt;Bitte überprüfen Sie die Installation!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync konnte keinen Speicher reservieren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync Verarbeitungsschritt &quot;Aktualisierung&quot; fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync Verarbeitungsschritt &quot;Abgleich&quot; fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync konnte sich nicht am Proxy authentifizieren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync konnte den Proxy oder Server nicht auflösen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync konnte sich nicht am Server %1 authentifizieren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync konnte sich nicht mit dem Netzwerk verbinden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Der auf dem Server eingehängte Ordner ist vorübergehend nicht verfügbar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Beim Öffnen eines Ordners ist ein Fehler aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Fehler beim Lesen eines Ordners.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Kein Platz auf Server %1 frei.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync unbekannter Fehler.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync-Zugriff fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync konnte das Journal nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte im lokalen Synchronisationsordner haben.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync versuchte einen Ordner anzulegen, der schon existiert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Der Dienst ist vorübergehend nicht erreichbar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Zugriff verboten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Ein interner Fehler mit der Fehlernummer %1  ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Die Datei ist in der Ignorierliste geführt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation>Dateinamen enden mit einem Punkt, die in diesem Dateisystem nicht unterstützt wird.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation>Dateinamen beinhalten das Zeichen &apos;%1&apos; und diese werden in diesem Dateisystems nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>Dateiname enthält Leerzeichen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Der Dateiname ist zu lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Dateikodierung ist ungültig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ungültige Zeichenm bitte benennen Sie &quot;%1&quot; um</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3631,12 +3655,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <source>Some time ago</source>
        <translation>vor einiger Zeit</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation> Το %1 δεν είναι αναγνώσιμο. </translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 αφαιρέθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ληφθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ενημερωθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>Το %1 έχει μετονομαστεί σε %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>Το %1 έχει μετακινηθεί στο %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Δραστηριότητα Συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
 Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,39 +725,39 @@ Are you sure you want to perform this operation?</source>
 Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Αφαίρεση Όλων των Αρχείων;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Αφαίρεση όλων των αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Διατήρηση αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -759,112 +765,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού &apos;%1&apos;, αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(αντίγραφο ασφαλείας)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(αντίγραοφ ασφαλέιας %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Απροσδιόριστη Κατάσταση.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Αναμονή έναρξης συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Προετοιμασία για συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Ο συγχρονισμός εκτελείται.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Σφάλμα Ρύθμισης.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Ματαίωση από Χρήστη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Παύση συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Παύση συγχρονισμού)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχεται ήδη σε φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
@@ -1024,12 +1030,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
    </message>
@@ -1105,6 +1111,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου &lt;b&gt;δεν&lt;/b&gt; υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1935,7 +1949,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -1963,27 +1977,27 @@ It is not advisable to use it.</source>
        <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -2069,7 +2083,7 @@ It is not advisable to use it.</source>
        <translation>Το αρχείο αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 204, αλλά ελήφθη &quot;%1 %2&quot;.</translation>
    </message>
@@ -2082,7 +2096,7 @@ It is not advisable to use it.</source>
        <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -2105,13 +2119,13 @@ It is not advisable to use it.</source>
        <translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -2119,22 +2133,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
@@ -2142,32 +2156,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2175,32 +2189,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
    </message>
@@ -2218,42 +2232,42 @@ It is not advisable to use it.</source>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Ώρα</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Αρχείο</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Φάκελος</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Ενέργεια</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Μέγεθος</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Πρωτόκολλο τοπικού συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
    </message>
@@ -2294,41 +2308,51 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Οι μη επιλεγμένοι φάκελοι θα &lt;b&gt;αφαιρεθούν&lt;/ b&gt; από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που επιθυμείτε να συγχρονίσετε.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που δεν επιθυμείτε να συγχρονίσετε.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Φόρτωση ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Όνομα</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Μέγεθος</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Παρουσιάστηκε σφάλμα κατά την φόρτωση της λίστας των υπο-φακέλων</translation>
    </message>
@@ -2841,285 +2865,285 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Επιτυχία.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>Το CSync απέτυχε να φορτώσει ο αρχείο καταλόγου. Το αρχείο καταλόγου έχει καταστραφεί.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.&lt;br/&gt;Παρακαλούμε επαληθεύσετε την εγκατάσταση!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Μοιραίο σφάλμα παράμετρου CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Ο προσαρτημένος φάκελος δεν είναι διαθέσιμος στον δικομιστή προσωρινά</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Παρουσιάστηκε σφάλμα κατά το άνοιγμα του φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Άγνωστο σφάλμα CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταγραφής. Βεβαιωθείτε ότι έχετε άδεια ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>Το CSync απέτυχε λόγω κατάστασης &quot;permission denied&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>Το CSync προσπάθησε να δημιουργήσει φάκελο που υπάρχει ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Δεν επιτρέπεται η πρόσβαση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3631,12 +3655,6 @@ It is not advisable to use it.</source>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,151 +604,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>El directorio local %1 no existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 debé ser una carpeta pero no lo es.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>No se puede leer %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1  ha sido eliminado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido descargado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido actualizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Actividad de Sync</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>¿Borrar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Borrar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -756,112 +762,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>No se pudo  </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Una antigua sincronización con journaling &apos;%1&apos; fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Estado no definido.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Preparando la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Sincronización en funcionamiento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>La última sincronización fue exitosa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Error de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Interrumpir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>La sincronización está en pausa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sincronización en pausa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>¡No tenés permisos para escribir el directorio seleccionado!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1021,12 +1027,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1102,6 +1108,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1928,7 +1942,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1956,27 +1970,27 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2062,7 +2076,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
@@ -2075,7 +2089,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,13 +2112,13 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2112,22 +2126,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2135,32 +2149,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2168,32 +2182,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2211,42 +2225,42 @@ It is not advisable to use it.</source>
        <translation>EtiquetaDeTexto</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Archivo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Acción</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar la lista de actividades al portapapeles.</translation>
    </message>
@@ -2287,41 +2301,51 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Deseleccionar Carpetas que serán &lt;b&gt;eliminadas&lt;/b&gt; de su sistema de archivos local y no será sincronizado más en este equipo</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Elige </translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Cargando...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nombre</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2832,285 +2856,285 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Éxito.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;No fue posible cargar el plugin de %1 para csync.&lt;br/&gt;Por favor, verificá la instalación&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync tuvo un error mientras procesaba los árboles de datos internos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync falló al reservar memoria.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Error fatal de parámetro en CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>Falló el proceso de actualización de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Falló el proceso de composición de CSync</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync no pudo autenticar el proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync falló al realizar la busqueda del proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync: fallo al autenticarse en el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync: fallo al conectarse a la red</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ha ocurrido un error de transmisión HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: No hay más espacio disponible en el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Error no especificado de CSync</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>El archivo está en la lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Imposible inicializar un diario de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3623,12 +3647,6 @@ It is not advisable to use it.</source>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,151 +604,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Kohalikku kausta %1 pole olemas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 pole loetav.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on alla laaditud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on uuendatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 on ümber nimetatud %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 on tõstetud %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Sünkroniseerimise tegevus</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Kustutada kõik failid?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Kustutada kõik failid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Säilita failid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Leiti varukoopia</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Tavaline sünkroonimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -756,112 +762,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Ei suutnud tühistada kataloogi staatust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Leiti vana sünkroniseeringu zurnaal &apos;%1&apos;, kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(varukoopia)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation> (varukoopia %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Määramata staatus.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Oodatakse sünkroonimise alustamist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Valmistun sünkroniseerima.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Sünkroniseerimine on käimas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Viimane sünkroniseerimine oli edukas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Seadistamise viga.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Kasutaja tühistamine.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Sünkroniseerimine on peatatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sünkroniseerimine on peatatud)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Sobilikku kausta pole valitud!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Valitud asukoht pole kaust!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1021,12 +1027,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1102,6 +1108,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering &lt;b&gt;ei ole&lt;/b&gt; toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1929,7 +1943,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1957,27 +1971,27 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Fail on serverist kustutatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Faili täielik allalaadimine ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Faili on pärast avastamist muudetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2063,7 +2077,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist. See on nüüd taastatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Server saatis vale HTTP koodi. Ootuspärane kood oli 204, aga saadeti kood &quot;%1 %2&quot;.</translation>
    </message>
@@ -2076,7 +2090,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Server saatis vale HTTP koodi. Ootuspärane kood oli 201, aga saadeti kood &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2099,13 +2113,13 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Server saatis vale HTTP koodi. Ootuspärane kood oli 201, aga saadeti kood &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2113,22 +2127,22 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2136,32 +2150,32 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2169,32 +2183,32 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Küsitluse URL puudub</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2212,42 +2226,42 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Tekstisilt</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Aeg</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Fail</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Kaust</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Tegevus</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Suurus</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
    </message>
@@ -2288,41 +2302,51 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Märkimata kataloogid &lt;b&gt;eemaldatakse&lt;/b&gt; kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Vali, mida sünkroniseerida</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Laadimine ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nimi</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Suurus</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Serveris pole praegu alamkaustasid.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2835,285 +2859,285 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Korras.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Ei suuda laadida csync lisa %1.&lt;br/&gt;Palun kontrolli paigaldust!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync sai vea sisemiste andmestruktuuride töötlemisel.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync ei suutnud mälu reserveerida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync parameetri saatuslik viga.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync uuendusprotsess ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync ei suutnud puhverserveris autoriseerida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>Csync ei suuda leida puhverserverit.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync autoriseering serveris %1 ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync võrguga ühendumine ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Toimus võrgukatkestus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP ülekande viga.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Serveris %1 on ruum otsas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync tuvastamatu viga.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSyncile ligipääs ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Teenus pole ajutiselt saadaval</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Ligipääs on keelatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fail on märgitud ignoreeritavate nimistus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Faili nimi on liiga pikk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Failinime kodeering pole kehtiv</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Faili nimesonvähemalt üks keelatud märk</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Vali, mida sünkroniseerida&quot; musta nimekirja tõttu vahele jäetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3625,12 +3649,6 @@ Selle kasutamine pole soovitatav.</translation>
        <source>Some time ago</source>
        <translation>Mõni aeg tagasi</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,151 +604,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Bertako %1 karpeta ez da existitzen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 karpeta bat izan behar zen baina ez da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 ezin da irakurri.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ezabatua izan da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 deskargatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 kargatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1  %2-(e)ra berrizendatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 %2-(e)ra mugitu da.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Sinkronizazio Jarduerak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Ezabatu Fitxategi Guztiak?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Ezabatu fitxategi guztiak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Mantendu fitxategiak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -756,112 +762,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Ezin izan da karpetaren egoera berrezarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Aurkitu da &apos;%1&apos; sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Definitu gabeko egoera.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Itxoiten sinkronizazioa hasteko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Sinkronizazioa prestatzen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Sinkronizazioa martxan da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Konfigurazio errorea.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Erabiltzaileak bertan behera utzi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Sinkronizazioa pausatuta dago.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sinkronizazioa pausatuta dago)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Ez da karpeta egokirik hautatu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Hautatutako bidea ez da karpeta bat!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1021,12 +1027,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Gehitu Sinkronizazio Konexioa</translation>
    </message>
@@ -1102,6 +1108,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Dagoeneko fitxategi guztiak sinkronizatzen ari zara. &lt;b&gt;Ezin&lt;b&gt; da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Hautatu zer nahi duzun sinkronizatzea: Sinkronizatu nahi ez dituzun urruneko azpikarpetak desmarkatu ditzazkezu.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1931,7 +1945,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1959,27 +1973,27 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Fitxategia zerbitzaritik ezabatua izan da</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2065,7 +2079,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
@@ -2078,7 +2092,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,13 +2115,13 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2115,22 +2129,22 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Fitxategia Ezabatua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2138,32 +2152,32 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,32 +2185,32 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2214,42 +2228,42 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>TestuEtiketa</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Noiz</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Fitxategia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Ekintza</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Tamaina</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Bertako sinkronizazio protokolo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiatu jarduera zerrenda arbelara.</translation>
    </message>
@@ -2290,41 +2304,51 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Desmarkatutako karpetak zure bertako fitxategi sistematik &lt;b&gt;ezabatuko&lt;/b&gt; dira eta ez dira gehiago ordenagailu honekin sinkronizatuko</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Hautatu zer nahi duzun sinkronizatzea: Hautatu sinkronizatu nahi dituzun urruneko azpikarpetak.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Hautatu zer nahi duzun sinkronizatzea: Desmarkatu sinkronizatu nahi ez dituzun urruneko azpikarpetak.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Hautatu zer sinkronizatu</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Kargatzen...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Izena</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Tamaina</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Ez dago azpikarpetarik zerbitzarian.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2835,285 +2859,285 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Arrakasta.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;csyncen %1 plugina ezin da kargatu.&lt;br/&gt;Mesedez egiaztatu instalazioa!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSyncek errorea izan du barne zuhaitzak prozesatzerakoan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSyncek huts egin du memoria alokatzean.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync parametro larri errorea.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync prozesatzearen eguneratu urratsak huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync prozesatzearen berdinkatze urratsak huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSyncek ezin izan du proxya autentikatu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSyncek huts egin du zerbitzaria edo proxia bilatzean.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSyncek huts egin du %1 zerbitzarian autentikatzean.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSyncek sarera konektatzean huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP transmisio errore bat gertatu da.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Errore bat egon da karpeta bat irekitzearkoan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSyncen zehaztugabeko errorea.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Ezin da sinkronizazio egunerokoa ireki</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3625,12 +3649,6 @@ Ez da gomendagarria erabltzea.</translation>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,151 +604,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>پوشه محلی %1 موجود نیست.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 قابل خواندن نیست.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بارگزاری شد.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بروز رسانی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 به %2 تغییر نام داده شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 به %2 انتقال داده شده است.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>فعالیت همگام سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>حذف تمام فایل ها؟</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>حذف تمام فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>نگه داشتن فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -756,112 +762,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation> (backup)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation> (پشتیبان %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>موقعیت تعریف نشده</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>آماده سازی برای همگام سازی کردن.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>همگام سازی در حال اجراست</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>آخرین همگام سازی موفقیت آمیز بود</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>خطا در پیکر بندی.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>خارج کردن کاربر.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>همگام سازی فعلا متوقف شده است</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (همگام‌سازی موقتا متوقف شده است)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>هیچ پوشه‌ی معتبری انتخاب نشده است!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1021,12 +1027,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1102,6 +1108,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1928,7 +1942,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1956,27 +1970,27 @@ It is not advisable to use it.</source>
        <translation>فایل از روی سرور حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2062,7 +2076,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
@@ -2075,7 +2089,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,13 +2112,13 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2112,22 +2126,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>فایل حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2135,32 +2149,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2168,32 +2182,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2211,42 +2225,42 @@ It is not advisable to use it.</source>
        <translation>برچسب متنی</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>زمان</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>فایل</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>پوشه</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>فعالیت</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>اندازه</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>کپی کردن</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
@@ -2287,41 +2301,51 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>انتخاب موارد همگام‌سازی</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>درحال بارگذاری...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>نام</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>اندازه</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2832,285 +2856,285 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>موفقیت</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;ماژول %1 برای csync نمی تواند بارگذاری شود.&lt;br/&gt;لطفا نصب را بررسی کنید!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync موفق به رزرو حافظه نشد است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>عدم موفقیت CSync  برای مراجعه به پروکسی یا سرور.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>عدم موفقیت CSync  برای اعتبار دادن در %1 سرور.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>یک خطا در هنگام باز کردن یک پوشه رخ داده‌ است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>خطا در هنگام خواندن پوشه</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>خطای نامشخص CSync </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>متوقف شده توسط کاربر</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>سرویس بصورت موقت خارج از دسترس است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>یک خطای داخلی با شماره خطای  %1  رخ داده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>نام فایل خیلی طولانی است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>وضعیت ناموفق</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>رمزگذاری نام فایل معتبر نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>کاراکتر نامعتبر، لطفا &quot;%1&quot; را تغییر نام دهید</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>با توجه به عدم اجازه‌ی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>حذف مجاز نیست، در حال بازگردادن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>فایل‌های محلی و پوشه‌ی اشتراک حذف شد.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3622,12 +3646,6 @@ It is not advisable to use it.</source>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -604,152 +604,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Paikallista kansiota %1 ei ole olemassa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 ei ole luettavissa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on ladattu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on päivitetty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 on nimetty uudeelleen muotoon %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 on siirretty kohteeseen %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Synkronointiaktiviteetti</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
 Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Poistetaanko kaikki tiedostot?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Poista kaikki tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Säilytä tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Varmuuskopio poistettu</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normaali synkronointi</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -757,112 +763,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Kansion tilaa ei voitu alustaa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation> (varmuuskopio)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation> (varmuuskopio %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Määrittelemätön tila.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Odotetaan synkronoinnin aloitusta.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Valmistellaan synkronointia.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Synkronointi on meneillään.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Asetusvirhe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synkronointi on keskeytetty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synkronointi on keskeytetty)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Kelvollista kansiota ei ole valittu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Valittu polku ei ole kansio!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Paikallinen kansio %1 sisältää kansion, jota käytetään kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1022,12 +1028,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Lisää kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Lisää synkronointiyhteys</translation>
    </message>
@@ -1103,6 +1109,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Päätä mitä synkronoidaan: voit valinnaisesti jättää valitsematta etäkansioita, joita et halua synkronoitavan.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1932,7 +1946,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -1960,27 +1974,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Tiedosto poistettiin palvelimelta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Tiedostoa ei voitu ladata täysin.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2066,7 +2080,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>HTTP-palvelin palautti väärän koodin. Odotettiin koodia 204, vastaanotettiin &quot;%1 %2&quot;.</translation>
    </message>
@@ -2079,7 +2093,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>HTTP-palvelin palautti väärän koodin. Odotettiin koodia 201, vastaanotettiin &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2102,13 +2116,13 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Tiedosto nimettiin uudelleen, mutta se on osa &quot;vain luku&quot;-jakoa. Alkuperäinen tiedosto palautettiin.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>HTTP-palvelin palautti väärän koodin. Odotettiin koodia 201, vastaanotettiin &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2116,22 +2130,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2139,32 +2153,32 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Odottamaton paluukoodi palvelimelta (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2172,32 +2186,32 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2215,42 +2229,42 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>TekstiLeima</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Aika</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Tiedosto</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Kansio</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Toiminto</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Koko</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Paikallinen synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopioi toimilista leikepöydälle.</translation>
    </message>
@@ -2291,41 +2305,51 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Ilman valintaa olevat kansiot &lt;b&gt;poistetaan&lt;/b&gt; paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Päätä mitä synkronoidaan: valitse etäkansiot, jotka haluat synkronoida.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Päätä mitä synkronoidaan: jätä valitsematta etäkansiot, joita et halua synkronoitavan.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Valitse synkronoitavat tiedot</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Ladataan...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nimi</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Koko</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Palvelimella ei ole alihakemistoja juuri nyt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Alikansioluetteloa ladatessa tapahtui virhe.</translation>
    </message>
@@ -2838,285 +2862,285 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Onnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1-liitännäistä csyncia varten ei voitu ladata.&lt;br/&gt;Varmista asennuksen toimivuus!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync ei onnistunut varaamaan muistia.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync ei onnistunut yhdistämään verkkoon.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Tapahtui verkon aikakatkaisu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Tapahtui HTTP-välitysvirhe.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Liitetty kansio on väliaikaisesti pois käytöstä tällä palvelimella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Kansiota avatessa tapahtui virhe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Kansiota lukiessa tapahtui virhe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Tiedosto/kansi ohitetaan, koska se on piilotettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync - määrittämätön virhe.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Palvelu ei ole juuri nyt käytettävissä</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Pääsy estetty</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Sisäinen virhe, numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Tiedosto on ohituslistalla.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Tiedoston nimi on liian pitkä.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Virheellisiä merkkejä, anna uusi nimi kohteelle &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Siirto ei ole sallittu, koska %1 on &quot;vain luku&quot;-tilassa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3628,12 +3652,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <source>Some time ago</source>
        <translation>Jokin aika sitten</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Le dossier local %1 n&apos;existe pas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 devrait être un dossier mais ne l&apos;est pas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 ne peut pas être lu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1 : %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été supprimé.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été téléchargé.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été mis à jour.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 a été renommé en %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 a été déplacé vers %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et  %n autres fichiers ont été déplacés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 ne peut pas être synchronisé en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n&apos;ont pas pu être synchronisés en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 n&apos;a pu être synchronisé pour cause d&apos;erreur. Consultez les logs pour les détails.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Activité de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
 Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,22 +725,22 @@ Peut-être la configuration a-t-elle été modifiée, ou les fichiers  supprimé
 Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Supprimer tous les fichiers ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Supprimer tous les fichiers</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Garder les fichiers</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -743,17 +749,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
 Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d&apos;un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Sauvegarde détectée</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Synchronisation normale</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Garder les fichiers locaux comme Conflits</translation>
    </message>
@@ -761,112 +767,112 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Impossible de réinitialiser l&apos;état du dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Un ancien fichier journal &apos;%1&apos; a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l&apos;utilise en ce moment.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(sauvegarde)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(sauvegarde %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Statut indéfini.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>En attente de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Préparation de la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>La synchronisation est en cours.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Dernière synchronisation effectuée avec succès</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>La dernière synchronisation s&apos;est achevée avec succès mais avec des avertissement à propos de certains fichiers.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Erreur d&apos;installation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Abandon par l&apos;utilisateur.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>La synchronisation est en pause.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisation en pause)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Aucun dossier valable sélectionné !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Le chemin sélectionné n&apos;est pas un dossier !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Vous n&apos;avez pas la permission d&apos;écrire dans le dossier sélectionné !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation>Le dossier local %1 contient un lien symbolique. La cible du lien contient un dossier déjà synchronisé. Veuillez en choisir un autre !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation>Il y a déjà une synchronisation depuis le serveur vers ce dossier local. Merci de choisir un autre dossier local !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Le dossier local %1 est un lien symbolique. Le dossier vers lequel le lien pointe est inclus dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
    </message>
@@ -1026,12 +1032,12 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ajouter une synchronisation de dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Ajouter une Synchronisation</translation>
    </message>
@@ -1107,6 +1113,14 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
        <translation>Vous sychronisez déjà tous vos fichiers. Synchroniser un autre dossier n&apos;est &lt;b&gt;pas&lt;/b&gt; pris en charge. Si vous voulez synchroniser plusieurs dossiers, veuillez supprimer la synchronisation du dossier racine qui est configurée actuellement.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Choisissez le contenu à synchroniser : vous pouvez éventuellement désélectionner les sous-dossiers distants que vous ne désirez pas synchroniser.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1937,7 +1951,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -1965,27 +1979,27 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Le fichier a été supprimé du serveur</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Le fichier n&apos;a pas pu être téléchargé intégralement.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Le fichier téléchargé est vide malgré que le serveur a annoncé qu&apos;il aurait dû être %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Le fichier a changé depuis sa découverte</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -2071,7 +2085,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Le fichier a été supprimé d&apos;un partage en lecture seule. Il a été restauré.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Le code HTTP retourné par le serveur n&apos;est pas valide. La valeur attendue est 204 mais la valeur reçue est &quot;%1 %2&quot;.</translation>
    </message>
@@ -2084,7 +2098,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Le code HTTP retourné par le serveur n&apos;est pas valide. La valeur attendue est 201 mais la valeur reçue est &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -2107,13 +2121,13 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Le code HTTP retourné par le serveur n&apos;est pas valide. La valeur attendue est 201 mais la valeur reçue est &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -2121,22 +2135,22 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Fichier supprimé</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -2144,32 +2158,32 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Fichier local supprimé pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Le serveur a retourné un code inattendu (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2177,32 +2191,32 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de conflit.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>URL de sondage manquante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Fichier local supprimé pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Le serveur n&apos;a pas confirmé la réception du dernier morceau. (Aucun e-tag n&apos;était présent).</translation>
    </message>
@@ -2220,42 +2234,42 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Heure</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Fichier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Action</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Protocole de synchronisation locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Copier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copier la liste d&apos;activités dans le presse-papier.</translation>
    </message>
@@ -2296,41 +2310,51 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Décochez les dossiers qui doivent être &lt;b&gt;supprimés&lt;/b&gt; de votre disque local et qui ne doivent pas être synchronisés avec cet ordinateur.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Choisir le contenu à synchroniser : Sélectionnez les sous-dossiers distants que vous voulez synchroniser.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Choisir le contenu à synchroniser : Désélectionnez les sous-dossiers distants que vous ne voulez pas synchroniser.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Choisir le contenu à synchroniser</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Chargement…</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nom</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Aucun sous-dossier sur le serveur.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
    </message>
@@ -2843,285 +2867,285 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Succès.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync a échoué à charger du fichier journal. Le fichier journal est corrompu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Le module additionnel %1 pour csync n&apos;a pas pu être chargé.&lt;br/&gt;Merci de vérifier votre installation !&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Erreur CSync lors du traitement des arbres internes.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Erreur lors de l&apos;allocation mémoire par CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Erreur fatale CSync : mauvais paramètre.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>Erreur CSync lors de l&apos;opération de mise à jour</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Erreur CSync lors de l&apos;opération de réconciliation</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync n&apos;a pu s&apos;authentifier auprès du proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync n&apos;a pu trouver le proxy ou serveur auquel se connecter.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync n&apos;a pu s&apos;authentifier auprès du serveur %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync n&apos;a pu établir une connexion au réseau.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Le délai d&apos;attente de la connexion réseau a été dépassé.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Une erreur de transmission HTTP s&apos;est produite.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Le dossier monté est temporairement indisponible sur le serveur</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Une erreur est survenue lors de l&apos;ouverture d&apos;un dossier</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Erreur lors de la lecture du dossier.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Le fichier/dossier est ignoré car il est caché.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter un dossier parent</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync : Aucun espace disponible sur le serveur %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Erreur CSync inconnue.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrompu par l&apos;utilisateur</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync n&apos;a pas pu accéder à</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le dossier de synchronisation local.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync a échoué en raison d&apos;un refus de permission non pris en charge.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync a tenté de créer un dossier déjà présent.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Le service est temporairement indisponible.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>L&apos;accès est interdit</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Une erreur interne numéro %1 est survenue.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Cet élément n&apos;a pas été synchronisé en raison des erreurs précédentes : %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Le fichier est dans la liste des fichiers à ignorer.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>Le nom du fichier se fini par des espaces.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Le nom de fichier est trop long.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat échoué.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>L&apos;encodage du nom de fichier n&apos;est pas valide</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caractères non valides. Veuillez renommer &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossible d&apos;initialiser un journal de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Impossible de lire la liste noire de la base de données locale</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Impossible de lire le journal de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossible d&apos;ouvrir le journal de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Le nom de fichier contient au moins un caractère non valable</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignoré à cause de la liste noire &quot;Choisir le contenu à synchroniser&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Fichiers locaux et répertoire de partage supprimés.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Déplacement non autorisé, élément restauré</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -3633,12 +3657,6 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <source>Some time ago</source>
        <translation>Il y a quelque temps</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1 : %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,152 +604,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>O cartafol local %1 non existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 non é lexíbel.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi retirado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi descargado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi enviado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 foi renomeado satisfactoriamente a %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 foi movido satisfactoriamente a %2</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Actividade de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Foi engadido un novo cartafol maior de  %1 MB: %2.
 Vaia aos axustes e seleccióneo se quere descargalo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Retirar todos os ficheiros?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Retirar todos os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Manter os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -757,112 +763,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Non foi posíbel restabelecer o estado do cartafol</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(copia de seguranza)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(copia de seguranza %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Estado sen definir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Preparando para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Estase sincronizando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronización fíxose correctamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Erro de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Interrompido polo usuario.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Sincronización en pausa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (sincronización en pausa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Non seleccionou ningún cartafol correcto!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Vostede non ten permiso para escribir neste cartafol!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1022,12 +1028,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1103,6 +1109,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Xa se están a sincronizar todos os ficheiros. Isto &lt;b&gt;non&lt;/b&gt; é compatíbel co sincronización doutro cartafol. Se quere sincronizar varios cartafoles, retire a sincronización do cartafol raíz configurado actualmente.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Escolla que sincronizar: Opcionalmente pode deselecionar subcartafoles remotos que non queira sincronizar.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1931,7 +1945,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1959,27 +1973,27 @@ Recomendámoslle que non o use.</translation>
        <translation>O ficheiro vai seren eliminado do servidor</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Non foi posíbel descargar completamente o ficheiro.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro cambiou após seren atopado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2065,7 +2079,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>O servidor devolveu código HTTP incorrecto. Agardábase 204, mais recibiuse «%1 %2».</translation>
    </message>
@@ -2078,7 +2092,7 @@ Recomendámoslle que non o use.</translation>
        <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2101,13 +2115,13 @@ Recomendámoslle que non o use.</translation>
        <translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2115,22 +2129,22 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>O ficheiro local cambiou durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2138,32 +2152,32 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt &lt;5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>O ficheiro local retirarase durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>O ficheiro local cambiou durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,32 +2185,32 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt &lt;5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Non se atopa o URL requirido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>O ficheiro local retirarase durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>O ficheiro local cambiou durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2214,42 +2228,42 @@ Recomendámoslle que non o use.</translation>
        <translation>Etiqueta de texto</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Ficheiro</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Cartafol</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Acción</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista da actividade no portapapeis.</translation>
    </message>
@@ -2290,41 +2304,51 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Os cartafoles non seleccionados van seren &lt;b&gt;eliminados&lt;/b&gt; do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Escolla que sincronizar: Seleccione os subcartafoles remotos que quere sincronizar.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Escolla que sincronizar: Desmarque os subcartafoles remotos que non queira sincronizar.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Escolla que sincronizar</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Cargando ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nome</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Actualmente non hai subcartafoles no servidor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2837,285 +2861,285 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Correcto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>Produciuse un fallo en CSync ao cargar o ficheiro de rexistro. O ficheiro de rexistro está estragado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Non foi posíbel cargar o engadido %1 para CSync.&lt;br/&gt;Verifique a instalación!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync tivo un erro ao procesar árbores internas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Produciuse un erro fatal de parámetro CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>Produciuse un fallo ao procesar o paso de actualización de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Produciuse un fallo ao procesar o paso de reconciliación de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync non puido autenticarse no proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSYNC no puido atopar o servidor proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync non puido autenticarse no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSYNC no puido conectarse á rede.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Excedeuse do tempo de espera para a conexión á rede.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Produciuse un erro na transmisión HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Produciuse un erro non especificado de CSync</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrompido polo usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>O servizo está temporalmente inaccesíbel.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Produciuse un erro interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>O ficheiro está na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>O nome de ficheiro é longo de máis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Fallou a obtención de estatísticas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>O nome de ficheiro codificado non é correcto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres incorrectos, déalle outro nome a «%1»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Non é posíbel preparar un rexistro de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Non foi posíbel abrir o rexistro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome de ficheiro contén algún carácter incorrecto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -3627,12 +3651,6 @@ Recomendámoslle que non o use.</translation>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -604,151 +604,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>%1 helyi mappa nem létezik.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 valószínűleg könyvtár, de nem az.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 nem olvasható.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen törölve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen letöltve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen feltöltve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 átnevezve erre: %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 áthelyezve ide: %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Szinkronizálási aktivitás</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Törli az összes fájlt?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Összes fájl eltávolítása</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Fájlok megtartása</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Biztonsági mentés észlelve</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normal szinkronizáció</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Helyi file-ok megtartása konfliktusként</translation>
    </message>
@@ -756,112 +762,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(biztonsági mentés)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(biztonsági mentés: %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Ismeretlen állapot.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Várakozás a szinkronizálás elindítására.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Előkészítés szinkronizációhoz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Szinkronizálás fut.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Legutolsó szinkronizálás sikeres volt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Az utolsó szinkronizáció sikeresen lefutott, de néhány figyelmeztetés van.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Beállítás hiba.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Felhasználó megszakította.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Szinkronizálás megállítva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (szinkronizálás megállítva)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Nincs érvényes könyvtár kiválasztva!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>A kiválasztott elérési út nem könyvtár!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Nincs joga a kiválasztott könyvtár írásához!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1021,12 +1027,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1102,6 +1108,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1928,7 +1942,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1956,27 +1970,27 @@ It is not advisable to use it.</source>
        <translation>A fájl törlésre került a szerverről</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2062,7 +2076,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
@@ -2075,7 +2089,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,13 +2112,13 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2112,22 +2126,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Fájl törölve</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2135,32 +2149,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2168,32 +2182,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2211,42 +2225,42 @@ It is not advisable to use it.</source>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Idő</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Fájl</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Mappa</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Művelet</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Méret</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Másolás</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Az aktivitási lista másolása a vágólapra.</translation>
    </message>
@@ -2287,41 +2301,51 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>A jelöletlen könyvtárak &lt;b&gt;törlésre kerülnek&lt;/b&gt; a helyi fájlrendszeredről és a továbbiakban nem lesz szinkronizálva ezzel a számítógéppel</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Szinkronizálandó elemek kiválasztása</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Betöltés ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Név</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Méret</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2833,285 +2857,285 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Sikerült.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Az %1 beépülőmodul a csync-hez nem tölthető be.&lt;br/&gt;Ellenőrizze a telepítést!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>A CSync hibába ütközött a belső adatok feldolgozása közben.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Hiba a CSync memórifoglalásakor.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync hibás paraméterhiba.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync frissítés feldolgozása meghíusult.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync egyeztetési lépés meghíusult.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>A CSync nem találja a proxy kiszolgálót.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>A CSync nem tuja azonosítani magát a %1 kiszolgálón.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync hálózati kapcsolódási hiba.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP átviteli hiba történt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ismeretlen hiba.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Felhasználó megszakította</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>A szolgáltatás ideiglenesen nem elérhető</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fájl a kizárási listán.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Fájlnév túl nagy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Érvénytelen karakterek, kérjük nevezd át: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>a cél</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>a forrás</translation>
    </message>
@@ -3623,12 +3647,6 @@ It is not advisable to use it.</source>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>La cartella locale %1 non esiste.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 non è leggibile.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato rimosso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato scaricato.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato aggiornato.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 è stato rinominato in %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 è stato spostato in %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Sincronizza attività</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Impossibile leggere il file di esclusione di sistema</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
 Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,22 +725,22 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
 Sei sicuro di voler eseguire questa operazione?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Vuoi rimuovere tutti i file?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Rimuovi tutti i file</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Mantieni i file</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -743,17 +749,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
 Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Backup rilevato</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Sincronizzazione normale</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Mantieni i file locali come conflitto</translation>
    </message>
@@ -761,112 +767,112 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Impossibile ripristinare lo stato della cartella</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>È stato trovato un vecchio registro di sincronizzazione &apos;%1&apos;, ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(copia di sicurezza)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(copia di sicurezza %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Stato non definito.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>In attesa di iniziare la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Preparazione della sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>La sincronizzazione è in corso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>L&apos;ultima sincronizzazione è stata completata correttamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Errore di configurazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Interrotto dall&apos;utente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>La sincronizzazione è sospesa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation> %1 (La sincronizzazione è sospesa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Nessuna cartella valida selezionata!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Il percorso selezionato non è una cartella!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation>La cartella locale %1 contiene un collegamento simbolico. La destinazione del collegamento contiene una cartella già sincronizzata. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation>Esiste già una sincronizzazione dal server a questa cartella locale. Seleziona un&apos;altra cartella locale!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
@@ -1026,12 +1032,12 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Aggiungi connessione di sincronizzazione</translation>
    </message>
@@ -1107,6 +1113,14 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
        <translation>Stai già sincronizzando tutti i tuoi file. La sincronizzazione di un&apos;altra cartella &lt;b&gt;non&lt;/b&gt; è supportata. Se vuoi sincronizzare più cartelle, rimuovi la configurazione della cartella principale di sincronizzazione.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Scegli cosa sincronizzare: puoi deselezionare opzionalmente le sottocartelle remote che non desideri sincronizzare.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1936,7 +1950,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -1964,27 +1978,27 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file è stato eliminato dal server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Il file non può essere scaricato completamente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Il file è stato modificato dal suo rilevamento</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2070,7 +2084,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Codice HTTP errato restituito dal server. Atteso 204, ma ricevuto &quot;%1 %2&quot;.</translation>
    </message>
@@ -2083,7 +2097,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2106,13 +2120,13 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2120,22 +2134,22 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2143,32 +2157,32 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzare l&apos;interruzione dell&apos;operazione in caso di ripristino della connessione HTTP con Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Codice di uscita inatteso dal server (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>File ID mancante dal server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>ETag mancante dal server</translation>
    </message>
@@ -2176,32 +2190,32 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzare l&apos;interruzione dell&apos;operazione in caso di ripristino della connessione HTTP con Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>URL di richiesta mancante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Il server non ha riconosciuto l&apos;ultimo pezzo. (Non era presente alcun e-tag)</translation>
    </message>
@@ -2219,42 +2233,42 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>EtichettaTesto</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Ora</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>File</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Cartella</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Azione</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Dimensione</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Protocollo di sincronizzazione locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia l&apos;elenco delle attività negli appunti.</translation>
    </message>
@@ -2295,41 +2309,51 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Le cartelle non marcate saranno &lt;b&gt;rimosse&lt;/b&gt; dal file system locale e non saranno sincronizzate più con questo computer</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Scegli cosa sincronizzare: seleziona le sottocartelle remote che desideri sincronizzare.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Scegli cosa sincronizzare: deseleziona le sottocartelle remote che non desideri sincronizzare.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Scegli cosa sincronizzare</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Caricamento in corso...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nome</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Dimensione</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Attualmente non ci sono sottocartelle sul server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Si è verificato un errore durante il caricamento dell&apos;elenco delle sottocartelle.</translation>
    </message>
@@ -2842,285 +2866,285 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Successo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync non è riuscito a scrivere il file di registro. Il file di registro è danneggiato.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Il plugin %1 per csync non può essere caricato.&lt;br/&gt;Verifica l&apos;installazione!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Errore di CSync durante l&apos;elaborazione degli alberi interni.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync non è riuscito a riservare la memoria.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Errore grave di parametro di CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>La fase di aggiornamento di CSync non è riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>La fase di riconciliazione di CSync non è riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync non è in grado di autenticarsi al proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync non è riuscito a trovare un proxy o server.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync non è riuscito ad autenticarsi al server %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync non è riuscito a connettersi alla rete.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Si è verificato un timeout della connessione di rete.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Si è verificato un errore di trasmissione HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>La cartella montata è temporaneamente indisponibile sul server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Si è verificato un errore durante l&apos;apertura di una cartella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Errore durante la lettura della cartella.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Il file/cartella è ignorato poiché è nascosto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: spazio insufficiente sul server %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Errore non specificato di CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrotto dall&apos;utente</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync non è riuscito ad accedere</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync non è riuscito a caricare o a creare il file journal. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>Problema di CSync a causa di un permesso negato non gestito.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync ha cercato di creare una cartella già esistente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Il servizio è temporaneamente non disponibile</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>L&apos;accesso è vietato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>SI è verificato un errore interno numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;elemento non è sincronizzato a causa dell&apos;errore precedente: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Il file è stato aggiunto alla lista ignorati.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>Il nome del file contiene spazi alla fine.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Il nome del file è troppo lungo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat non riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>La codifica del nome del file non è valida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caratteri non validi, rinomina &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Impossibile leggere la lista nera dal database locale</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Impossibile leggere dal registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Il nome del file contiene almeno un carattere non valido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -3632,12 +3656,6 @@ Non è consigliabile utilizzarlo.</translation>
        <source>Some time ago</source>
        <translation>Tempo fa</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>ローカルフォルダー %1 は存在しません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 は読み込み可能ではありません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 は削除されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 はダウンロードされました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 が更新されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 の名前が %2 に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 は %2 に移動しました。</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>同期アクティビティ</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>システム上の除外ファイルを読み込めません</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>新しい %1 MB以上のフォルダーが追加されました: %2
 ダウンロードしたい場合は、設定画面で選択してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,39 +725,39 @@ Are you sure you want to perform this operation?</source>
 本当にこの操作を実行しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>すべてのファイルを削除しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>すべてのファイルを削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>ファイルを残す</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation>この同期により同期フォルダ &apos;%1&apos; のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>バックアップが検出されました</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>正常同期</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>コンフリクト時にローカルファイルを保持</translation>
    </message>
@@ -759,112 +765,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>フォルダーの状態をリセットできませんでした</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>古い同期ジャーナル  &apos;%1&apos; が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(バックアップ)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(%1をバックアップ)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>未定義の状態。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>同期開始を待機中</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>同期の準備中。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>同期を実行中です。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>最後の同期は成功しました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>最新の同期は成功しました。しかし、一部のファイルに問題がありました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>設定エラー。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>ユーザーによる中止。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>同期を一時停止しました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (同期を一時停止)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>有効なフォルダーが選択されていません！</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>指定のパスは、フォルダーではありません！</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>選択されたフォルダーに書き込み権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation>ローカルフォルダ %1 にはシンボリックリンクが含まれています。リンク先には既に同期されたフォルダが含まれているため、別のフォルダを選択してください！</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation>既に同期されたフォルダがあります。別のフォルダを選択してください！</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダーを含んでいます。他のフォルダーを選択してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください！</translation>
    </message>
@@ -1024,12 +1030,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>同期フォルダーを追加</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>同期接続を追加</translation>
    </message>
@@ -1105,6 +1111,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>すべてのファイルはすでに同期されています。他のフォルダーの同期は&lt;b&gt;サポートしていません&lt;/&gt;。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>何を同期するか選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1933,7 +1947,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -1961,27 +1975,27 @@ It is not advisable to use it.</source>
        <translation>ファイルはサーバーから削除されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>このファイルのダウンロードは完了しませんでした</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>ファイルは発見以降に変更されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2067,7 +2081,7 @@ It is not advisable to use it.</source>
        <translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>誤ったHTTPコードがサーバーから返されました。204のはずが、&quot;%1 %2&quot;が返りました。</translation>
    </message>
@@ -2080,7 +2094,7 @@ It is not advisable to use it.</source>
        <translation>誤ったHTTPコードがサーバーから返されました。201のはずが、&quot;%1 %2&quot;が返りました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2103,13 +2117,13 @@ It is not advisable to use it.</source>
        <translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>誤ったHTTPコードがサーバーから返されました。201のはずが、&quot;%1 %2&quot;が返りました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2117,22 +2131,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>ファイルを削除しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2140,32 +2154,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>ローカルファイルを同期中に削除します。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>サーバー (%1) からの予期しない戻りコード</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>サーバーからファイルIDの戻りがありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>サーバーからETagの戻りがありません</translation>
    </message>
@@ -2173,32 +2187,32 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>ポーリングURLがありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>ローカルファイルを同期中に削除します。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation>
    </message>
@@ -2216,42 +2230,42 @@ It is not advisable to use it.</source>
        <translation>テキストラベル</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>時刻</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>ファイル</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>フォルダー</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>アクション</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>サイズ</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>ローカルファイル同期状況</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>コピー</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>アクティビティ一覧をコピーする</translation>
    </message>
@@ -2292,41 +2306,51 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>チェックしていないフォルダーはローカルファイルシステムから &lt;b&gt;削除&lt;/b&gt;され､このコンピューターと同期されなくなります。</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>同期対象の選択: 同期したいリモートのサブフォルダーを選択してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>同期対象の選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>同期フォルダーを選択</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>読込中 ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>名前</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>サイズ</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>現在サーバーにサブフォルダーはありません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
    </message>
@@ -2839,285 +2863,285 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>成功。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSyncはジャーナルファイルの読み込みに失敗しました。ジャーナルファイルが破損しています。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;csync 用の %1 プラグインをロードできませんでした。&lt;br/&gt;インストール状態を確認してください！&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSyncで使用するメモリの確保に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSyncの致命的なパラメータエラーです。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSyncの処理ステップの更新に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSyncの処理ステップの調停に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSyncはそのプロキシで認証できませんでした。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSyncはネットワークへの接続に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>ネットワーク接続のタイムアウトが発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTPの伝送エラーが発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>サーバー上のマウント済フォルダーが一時的に利用できません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>フォルダーを開く際にエラーが発生しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>フォルダーの読み込みエラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>隠しファイル/フォルダーのため無視されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>親フォルダーを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>そのフォルダーにファイルを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSyncの未指定のエラーです。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>ユーザーによって中止されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync は接続できませんでした</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期フォルダーに読み書きの権限があるか確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync が処理できないパーミション拒否により失敗しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSyncはすでに存在するフォルダーを作成しようとしました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>サーバーは一時的に利用できません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>アクセスが禁止されています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>内部エラー番号 %1 が発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>同期機能はシンボリックリンクをサポートしていません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>ファイルは除外リストに登録されています。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>ファイル名末尾にスペースが含まれます。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>ファイル名が長すぎます</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>情報取得エラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>ファイル名のエンコーディングが無効です。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>無効な文字です、&quot;%1&quot; を変更してください。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>同期ジャーナルの初期化ができません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>ローカルデータベースからブラックリストを読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>同期ジャーナルから読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>同期ジャーナルを開くことができません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;同期対象先&quot; ブラックリストにより無視されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>削除できないので復元しています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>ローカルファイルと共有フォルダーを削除しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>移動できないので項目を復元しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 は読み取り専用のため移動できません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -3629,12 +3653,6 @@ It is not advisable to use it.</source>
        <source>Some time ago</source>
        <translation>数分前</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokal mappe %1 eksisterer ikke.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 skal være en mappe men er ikke det.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 kan ikke leses.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt lastet ned.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt oppdatert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 har blitt omdøpt til %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 har blitt flyttet til %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <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="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 og %2 annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %2 andre filer har blitt lastet ned.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 og %2 annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %2 andre filer har blitt oppdatert.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Synkroniseringsaktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
 Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,22 +725,22 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
 Er du sikker på at du vil utføre denne operasjonen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Fjerne alle filer?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Fjern alle filer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Behold filer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -743,17 +749,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren.
 Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Backup oppdaget</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normal synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behold lokale filer som konflikt</translation>
    </message>
@@ -761,112 +767,112 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Klarte ikke å tilbakestille mappetilstand</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>En gammel synkroniseringsjournal &apos;%1&apos; ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation> (sikkerhetskopi)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation> (sikkerhetskopi %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Udefinert tilstand.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Venter på å starte synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Forbereder synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Synkronisering kjører.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Siste synkronisering var vellykket.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Siste synkronisering var vellykket, men med advarsler på enkelte filer.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Feil med oppsett.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Brukeravbrudd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synkronisering er satt på pause.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synkronisering er satt på pause)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Ingen gyldig mappe valgt!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Den valgte stien er ikke en mappe!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Du har ikke skrivetilgang til den valgte mappen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
@@ -1026,12 +1032,12 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Legg til mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Legg til tilkobling for synkronisering</translation>
    </message>
@@ -1107,6 +1113,14 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
        <translation>Du synkroniserer allerede alle filene dine. Synkronisering av enda en mappe støttes &lt;b&gt;ikke&lt;/b&gt;. Hvis du vil synkronisere flere mapper må du fjerne den konfigurerte synkroniseringen av rotmappe.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Velg hva som skal synkroniseres: Du kan velge bort mapper som du ikke vil synkronisere.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1937,7 +1951,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -1965,27 +1979,27 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Filen ble slettet fra serveren</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Hele filen kunne ikke lastes ned.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Filen er endret siden den ble oppdaget</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -2071,7 +2085,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Filen er blitt fjernet fra en deling med lesetilgang. Den ble gjenopprettet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Feil HTTP-kode returnert fra server. Ventet 204, men mottok &quot;%1 %2&quot;.</translation>
    </message>
@@ -2084,7 +2098,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -2107,13 +2121,13 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Filen ble gitt nytt navn mer er en del av en deling med lesetilgang. Den opprinnelige filen ble gjenopprettet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -2121,22 +2135,22 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Fil fjernet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -2144,32 +2158,32 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Den lokale filen ble fjernet under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Uventet returkode fra serveren (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>Mangler File ID fra server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>Mangler ETag fra server</translation>
    </message>
@@ -2177,32 +2191,32 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Filen ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>Forespørsels-URL mangler</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Den lokale filen ble fjernet under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
    </message>
@@ -2220,42 +2234,42 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Tekst-etikett</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Tid</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Fil</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Mappe</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Handling</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Størrelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Lokal synkroniseringsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopier aktivitetslisten til utklippstavlen.</translation>
    </message>
@@ -2296,41 +2310,51 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Umarkerte mapper vil bli &lt;b&gt;fjernet&lt;/b&gt; fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Velg hva som skal synkroniseres: Velg eksterne undermapper som du vil synkronisere.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Velg hva som skal synkroniseres: Velg bort eksterne undermapper som du ikke vil synkronisere.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Velg hva som synkroniseres</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Laster ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Navn</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Størrelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Ingen undermapper på serveren nå</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Det oppstod en feil ved lasting av liten med undermapper.</translation>
    </message>
@@ -2843,285 +2867,285 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Suksess.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync kunne ikke laste inn journalfilen. Journalfilen er ødelagt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Klarte ikke å laste utvidelse %1 for csync.&lt;br/&gt;Verifiser installasjonen!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync fikk en feil under behandling av intern trestruktur.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync klarte ikke å reservere minne.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync fatal parmeterfeil.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync-behandlingssteg oppdatering feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync-behandlingssteg overensstemming feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync klarte ikke å autentisere mot proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync klarte ikke å slå opp proxy eller server.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync karte ikke å autentisere på serveren %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync klarte ikke å koble seg til nettverket.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Det oppstod et tidsavbrudd for en nettverksforbindelse.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>En HTTP-overføringsfeil oppstod.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Den oppkoblede mappen er for tiden ikke tilgjengelig på serveren</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Det oppstod en feil ved åpning av en mappe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Feil ved lesing av mappe.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Filen/mappen ignoreres fordi den er skjult.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Ikke ledig plass tilgjengelig på server %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync uspesifisert feil.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Avbrutt av brukeren</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync klarte ikke å aksessere</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync klarte ikke å laste eller opprette journalfilen. Sjekk at du har lese- og skrivetilgang i den lokale synkroniseringsmappen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync feilet fordi nektet tilgang ikke ble håndtert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync prøvde å opprette en mappe som finnes allerede.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Tjenesten er midlertidig utilgjengelig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Tilgang er nektet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>En intern feil nummer %1 oppstod.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Elementet er ikke synkronisert på grunn av tidligere feil: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolske lenker støttes ikke i synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Filen ligger på ignoreringslisten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>Filnavn inneholder blanke på slutten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Filnavn er for langt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Filnavn-koding er ikke gyldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ugyldige tegn, gi et annet navn til &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Kan ikke lese fra synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan ikke åpne synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorert på grunn av svartelisten &quot;velg hva som skal synkroniseres&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ikke tillatt å fjerne, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale filer og delingsmappe fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Flytting ikke tillatt, element gjenopprettet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>målet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>kilden</translation>
    </message>
@@ -3633,12 +3657,6 @@ Det er ikke tilrådelig å bruke den.</translation>
        <source>Some time ago</source>
        <translation>For en stund siden</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokale map %1 bestaat niet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 is niet leesbaar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is verwijderd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is gedownload.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is bijgewerkt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 is hernoemd naar %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 is verplaatst naar %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Synchronisatie-activiteit</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
 Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,22 +725,22 @@ Dat zou kunnen gebeuren, omdat de map stilletjes was geherconfigureerd, of omdat
 Weet je zeker dat je door wilt gaan?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Verwijder alle bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Verwijder alle bestanden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Bewaar bestanden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -743,17 +749,17 @@ Dit kan komen doordat een backup is hersteld op de server.
 Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere versie. Wilt u uw lokale meer recente bestanden behouden als conflict bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Backup gedetecteerd</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normale synchronisatie</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behoud lokale bestanden als conflict</translation>
    </message>
@@ -761,112 +767,112 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Kan de beginstaat van de map niet terugzetten</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Een oud synchronisatieverslag  &apos;%1&apos; is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(backup)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(backup %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Ongedefiniëerde staat</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>In afwachting van synchronisatie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisatie wordt voorbereid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Bezig met synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Laatste synchronisatie was geslaagd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Installatiefout.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Afgebroken door gebruiker.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synchronisatie gepauzeerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisatie onderbroken)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Geen geldige map geselecteerd!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Het geselecteerde pad is geen map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation>Lokale map %1 bevat een symbolische link. De doellink bevat een map die al is gesynchroniseerd. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation>Er wordt vanaf de server al naar deze lokale map gesynchroniseerd. Kies een andere lokale map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
    </message>
@@ -1027,12 +1033,12 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Toevoegen Sync verbinding</translation>
    </message>
@@ -1108,6 +1114,14 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
        <translation>U bent al uw bestanden al aan het synchroniseren. Het synchroniseren van een andere map wordt &lt;b&gt;niet&lt;/b&gt; ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Kies wat u wilt synchroniseren: u kunt optioneel submappen die u niet wilt synchroniseren deselecteren.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1942,7 +1956,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -1970,27 +1984,27 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Bestand was verwijderd van de server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Het bestand kon niet volledig worden gedownload.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2076,7 +2090,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation>Foutieve HTTP code ontvangen van de server. Verwacht was 204, maar ontvangen &quot;%1 %2&quot;.</translation>
    </message>
@@ -2089,7 +2103,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Foutieve HTTP code ontvangen van de server. Verwacht was 201, maar ontvangen &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2112,13 +2126,13 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation>Foutieve HTTP code ontvangen van de server. Verwacht werd 201, maar ontvangen &quot;%1 %2&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2126,22 +2140,22 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2149,32 +2163,32 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation>Onverwachte reactie van server (%1)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation>Ontbrekende File ID van de server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation>Ontbrekende ETag van de server</translation>
    </message>
@@ -2182,32 +2196,32 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation>URL opvraag ontbreekt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
    </message>
@@ -2225,42 +2239,42 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Tekstlabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Tijd</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Bestand</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Map</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Handeling</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Grootte</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Lokaal sync protocol</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopiëren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopieer de activiteitenlijst naar het klembord.</translation>
    </message>
@@ -2301,41 +2315,51 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Niet geselecteerde mappen worden &lt;b&gt;verwijderd&lt;/b&gt; van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation>Kies wat u wilt synchroniseren: Selecteer externe submappen die u wilt synchroniseren.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Kies wat u wilt synchroniseren: u kunt submappen die u niet wilt synchroniseren deselecteren.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Kies wat te synchroniseren</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Laden ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Naam</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Grootte</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation>Momenteel geen submappen op de server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
    </message>
@@ -2848,285 +2872,285 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Succes.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync kon het journal bestand niet inladen. Het journal bestand is kapot.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;De %1 plugin voor csync kon niet worden geladen.&lt;br/&gt;Verifieer de installatie!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync kon geen geheugen reserveren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync fatale parameter fout.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync verwerkingsstap bijwerken mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync verwerkingsstap verzamelen mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync kon niet authenticeren bij de proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync kon geen proxy of server vinden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync kon niet authenticeren bij de  %1 server.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync kon niet verbinden met het netwerk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Er trad een netwerk time-out op.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Er trad een HTTP transmissiefout plaats.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>De gemounte map is tijdelijk niet beschikbaar op de server</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Er trad een fout op bij het openen van een map</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Fout tijdens lezen map.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Geen ruimte op %1 server beschikbaar.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ongedefinieerde fout.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Afgebroken door de gebruiker</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation>CSync kreeg geen toegang</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation>CSync probeerde een al bestaande map aan te maken.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>De dienst is tijdelijk niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Toegang verboden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation>Een interne fout met nummer %1 is opgetreden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Het bestand is opgenomen op de negeerlijst.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation>Bestandsnamen met een &apos;%1&apos; symbool worden niet ondersteund door het bestandssysteem.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation>De bestandsnaam bevat spaties achteraan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>De bestandsnaam is te lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Stat mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation>Bestandsnaamcodering is niet geldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ongeldige tekens, hernoem &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Niet in staat om een synchronisatie transactielog te starten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Kan de blacklist niet lezen uit de lokale database</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; zwarte lijst</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan om te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale bestanden en share-map verwijderd. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -3638,12 +3662,6 @@ We adviseren deze site niet te gebruiken.</translation>
        <source>Some time ago</source>
        <translation>Even geleden</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
@@ -547,7 +547,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="773"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -604,113 +604,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="138"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Folder lokalny %1 nie istnieje.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="141"/>
+        <location filename="../src/gui/folder.cpp" line="144"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 powinien być katalogiem, ale nie jest.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="144"/>
+        <location filename="../src/gui/folder.cpp" line="147"/>
        <source>%1 is not readable.</source>
        <translation>%1 jest nie do odczytu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="367"/>
+        <location filename="../src/gui/folder.cpp" line="350"/>
+        <source>%1: %2</source>
+        <extracomment>this displays an error string (%2) for a file %1</extracomment>
+        <translation>%1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/folder.cpp" line="457"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został usunięty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="374"/>
+        <location filename="../src/gui/folder.cpp" line="464"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został ściągnięty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="471"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został uaktualniony.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="388"/>
+        <location filename="../src/gui/folder.cpp" line="478"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 zmienił nazwę na %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="395"/>
+        <location filename="../src/gui/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 został przeniesiony do %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="365"/>
+        <location filename="../src/gui/folder.cpp" line="455"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="372"/>
+        <location filename="../src/gui/folder.cpp" line="462"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="379"/>
+        <location filename="../src/gui/folder.cpp" line="469"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="386"/>
+        <location filename="../src/gui/folder.cpp" line="476"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>Zmieniono nazwę %1 na %2 oraz %n innemu plikowi została zmieniona nazwa.</numerusform><numerusform>Zmieniono nazwę %1 na %2 oraz %n innym plikom została zmieniona nazwa.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="393"/>
+        <location filename="../src/gui/folder.cpp" line="483"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inny plik.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inne pliki.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="400"/>
+        <location filename="../src/gui/folder.cpp" line="490"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="402"/>
+        <location filename="../src/gui/folder.cpp" line="492"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="407"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="409"/>
+        <location filename="../src/gui/folder.cpp" line="499"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="415"/>
+        <location filename="../src/gui/folder.cpp" line="505"/>
        <source>Sync Activity</source>
        <translation>Aktywności synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="642"/>
+        <location filename="../src/gui/folder.cpp" line="744"/>
        <source>Could not read system exclude file</source>
        <translation>Nie można przeczytać pliku wyłączeń</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="850"/>
+        <location filename="../src/gui/folder.cpp" line="956"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Nowy folder większy od %1 MB został dodany
 Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="888"/>
+        <location filename="../src/gui/folder.cpp" line="994"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
@@ -719,39 +725,39 @@ Może to być spowodowane faktem, że folder został przekonfigurowany lub wszys
 Czy jesteś pewien, że chcesz wykonać tę operację ?	</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="892"/>
+        <location filename="../src/gui/folder.cpp" line="998"/>
        <source>Remove All Files?</source>
        <translation>Usunąć wszystkie pliki?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="894"/>
+        <location filename="../src/gui/folder.cpp" line="1000"/>
        <source>Remove all files</source>
        <translation>Usuń wszystkie pliki</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="895"/>
+        <location filename="../src/gui/folder.cpp" line="1001"/>
        <source>Keep files</source>
        <translation>Pozostaw pliki</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="911"/>
+        <location filename="../src/gui/folder.cpp" line="1017"/>
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="916"/>
+        <location filename="../src/gui/folder.cpp" line="1022"/>
        <source>Backup detected</source>
        <translation>Wykryto kopię zapasową.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="918"/>
+        <location filename="../src/gui/folder.cpp" line="1024"/>
        <source>Normal Synchronisation</source>
        <translation>Normalna synchronizacja.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="919"/>
+        <location filename="../src/gui/folder.cpp" line="1025"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
    </message>
@@ -759,112 +765,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="293"/>
+        <location filename="../src/gui/folderman.cpp" line="294"/>
        <source>Could not reset folder state</source>
        <translation>Nie udało się zresetować stanu folderu</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="294"/>
+        <location filename="../src/gui/folderman.cpp" line="295"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Stary sync journal &apos;%1&apos; został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1030"/>
+        <location filename="../src/gui/folderman.cpp" line="1031"/>
        <source> (backup)</source>
        <translation>(kopia zapasowa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1035"/>
+        <location filename="../src/gui/folderman.cpp" line="1036"/>
        <source> (backup %1)</source>
        <translation>(kopia zapasowa %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1242"/>
+        <location filename="../src/gui/folderman.cpp" line="1243"/>
        <source>Undefined State.</source>
        <translation>Niezdefiniowany stan</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1245"/>
+        <location filename="../src/gui/folderman.cpp" line="1246"/>
        <source>Waiting to start syncing.</source>
        <translation>Poczekaj na rozpoczęcie synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1248"/>
+        <location filename="../src/gui/folderman.cpp" line="1249"/>
        <source>Preparing for sync.</source>
        <translation>Przygotowuję do synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1251"/>
+        <location filename="../src/gui/folderman.cpp" line="1252"/>
        <source>Sync is running.</source>
        <translation>Synchronizacja w toku</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1254"/>
+        <location filename="../src/gui/folderman.cpp" line="1255"/>
        <source>Last Sync was successful.</source>
        <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1259"/>
+        <location filename="../src/gui/folderman.cpp" line="1260"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1262"/>
+        <location filename="../src/gui/folderman.cpp" line="1263"/>
        <source>Setup Error.</source>
        <translation>Błąd ustawień.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1265"/>
+        <location filename="../src/gui/folderman.cpp" line="1266"/>
        <source>User Abort.</source>
        <translation>Użytkownik anulował.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1268"/>
+        <location filename="../src/gui/folderman.cpp" line="1269"/>
        <source>Sync is paused.</source>
        <translation>Synchronizacja wstrzymana</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1274"/>
+        <location filename="../src/gui/folderman.cpp" line="1275"/>
        <source>%1 (Sync is paused)</source>
        <translation> %1 (Synchronizacja jest zatrzymana)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1282"/>
+        <location filename="../src/gui/folderman.cpp" line="1283"/>
        <source>No valid folder selected!</source>
        <translation>Nie wybrano poprawnego folderu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1292"/>
+        <location filename="../src/gui/folderman.cpp" line="1293"/>
        <source>The selected path is not a folder!</source>
        <translation>Wybrana ścieżka nie jest katalogiem!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1296"/>
+        <location filename="../src/gui/folderman.cpp" line="1297"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Nie masz uprawnień, aby zapisywać w tym  katalogu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1347"/>
+        <location filename="../src/gui/folderman.cpp" line="1348"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1362"/>
+        <location filename="../src/gui/folderman.cpp" line="1363"/>
        <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1320"/>
+        <location filename="../src/gui/folderman.cpp" line="1321"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1330"/>
+        <location filename="../src/gui/folderman.cpp" line="1331"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1339"/>
+        <location filename="../src/gui/folderman.cpp" line="1340"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
@@ -1024,12 +1030,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="551"/>
+        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
        <translation>Dodaj folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
        <translation>Dodaj połączenie synchronizacji</translation>
    </message>
@@ -1105,6 +1111,14 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Już aktualizujesz wszystkie pliku. Synchronizacja innego folderu &lt;b&gt;nie&lt;/b&gt; jest wspierana. Jeśli chcesz synchronizować wiele folderów, proszę usuń aktualnie skonfigurowaną synchronizację folderu głównego.</translation>
    </message>
 </context>
+<context>
+    <name>OCC::FolderWizardSelectiveSync</name>
+    <message>
+        <location filename="../src/gui/folderwizard.cpp" line="486"/>
+        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
+        <translation>Wybierz co synchronizować: Możesz opcjonalnie odznaczyć podkatalogi, których nie chcesz synchronizować.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::FormatWarningsWizardPage</name>
    <message>
@@ -1935,7 +1949,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="719"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="725"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -1963,27 +1977,27 @@ Niezalecane jest jego użycie.</translation>
        <translation>Plik został usunięty z serwera</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="547"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Ten plik nie mógł być całkowicie pobrany.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="554"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="713"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="763"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="813"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2069,7 +2083,7 @@ Niezalecane jest jego użycie.</translation>
        <translation>Plik został usunięty z zasobu z prawem tylko do odczytu. Został przywrócony.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotedelete.cpp" line="117"/>
+        <location filename="../src/libsync/propagateremotedelete.cpp" line="118"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
@@ -2082,7 +2096,7 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemkdir.cpp" line="147"/>
+        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2105,13 +2119,13 @@ Niezalecane jest jego użycie.</translation>
        <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="154"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="155"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="185"/>
-        <location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="186"/>
+        <location filename="../src/libsync/propagateremotemove.cpp" line="192"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2119,22 +2133,22 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateUploadFileCommon</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="299"/>
        <source>File Removed</source>
        <translation>Usunięto plik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="317"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="311"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="329"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="323"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="581"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="576"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2142,32 +2156,32 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateUploadFileNG</name>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="370"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="365"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="401"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="396"/>
        <source>The local file was removed during sync.</source>
        <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="412"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="407"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
        <source>Unexpected return code from server (%1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="463"/>
        <source>Missing File ID from server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadng.cpp" line="481"/>
+        <location filename="../src/libsync/propagateuploadng.cpp" line="476"/>
        <source>Missing ETag from server</source>
        <translation type="unfinished"/>
    </message>
@@ -2175,32 +2189,32 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateUploadFileV1</name>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="197"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="198"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="205"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="206"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="241"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="264"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
        <source>The local file was removed during sync.</source>
        <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="276"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateuploadv1.cpp" line="290"/>
+        <location filename="../src/libsync/propagateuploadv1.cpp" line="291"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2218,42 +2232,42 @@ Niezalecane jest jego użycie.</translation>
        <translation>Etykieta</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="54"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
        <source>Time</source>
        <translation>Czas</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="55"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>File</source>
        <translation>Plik</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
        <source>Folder</source>
        <translation>Folder</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
        <source>Action</source>
        <translation>Akcja</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="58"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="59"/>
        <source>Size</source>
        <translation>Rozmiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="79"/>
        <source>Local sync protocol</source>
        <translation>Lokalny protokół synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy</source>
        <translation>Kopiuj</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="82"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiuj listę aktywności do schowka.</translation>
    </message>
@@ -2294,41 +2308,51 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::SelectiveSyncDialog</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="443"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
+        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
+        <translation>Niezaznaczone katalogi zostaną &lt;b&gt;usunięte&lt;/b&gt; z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
        <source>Choose What to Sync</source>
        <translation>Wybierz co synchronizować</translation>
    </message>
 </context>
 <context>
-    <name>OCC::SelectiveSyncWidget</name>
+    <name>OCC::SelectiveSyncTreeView</name>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="65"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="60"/>
        <source>Loading ...</source>
        <translation>Wczytuję ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
-        <source>Deselect remote folders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
        <source>Name</source>
        <translation>Nazwa</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="92"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="74"/>
        <source>Size</source>
        <translation>Rozmiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="219"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="268"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="201"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="245"/>
        <source>No subfolders currently on the server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="270"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
        <translation type="unfinished"/>
    </message>
@@ -2841,285 +2865,285 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::SyncEngine</name>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="119"/>
        <source>Success.</source>
        <translation>Sukces.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="126"/>
        <source>CSync failed to load the journal file. The journal file is corrupted.</source>
        <translation>CSync nie udało się wczytać pliku dziennika. Plik dziennika jest uszkodzony.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="131"/>
+        <location filename="../src/libsync/syncengine.cpp" line="129"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Wtyczka %1 do csync nie może być załadowana.&lt;br/&gt;Sprawdź poprawność instalacji!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="134"/>
+        <location filename="../src/libsync/syncengine.cpp" line="132"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync napotkał błąd podczas przetwarzania wewnętrznych drzew.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="137"/>
+        <location filename="../src/libsync/syncengine.cpp" line="135"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync nie mógł zarezerwować pamięci.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="140"/>
+        <location filename="../src/libsync/syncengine.cpp" line="138"/>
        <source>CSync fatal parameter error.</source>
        <translation>Krytyczny błąd parametru CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="143"/>
+        <location filename="../src/libsync/syncengine.cpp" line="141"/>
        <source>CSync processing step update failed.</source>
        <translation>Aktualizacja procesu przetwarzania CSync nie powiodła się.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="146"/>
+        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Scalenie w procesie przetwarzania CSync nie powiodło się.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="149"/>
+        <location filename="../src/libsync/syncengine.cpp" line="147"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync nie mógł się uwierzytelnić przez proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="152"/>
+        <location filename="../src/libsync/syncengine.cpp" line="150"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync nie mógł odnaleźć serwera proxy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="155"/>
+        <location filename="../src/libsync/syncengine.cpp" line="153"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync nie mógł uwierzytelnić się na serwerze %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="158"/>
+        <location filename="../src/libsync/syncengine.cpp" line="156"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync nie mógł połączyć się z siecią.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="161"/>
+        <location filename="../src/libsync/syncengine.cpp" line="159"/>
        <source>A network connection timeout happened.</source>
        <translation>Upłynął limit czasu połączenia.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="164"/>
+        <location filename="../src/libsync/syncengine.cpp" line="162"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Wystąpił błąd transmisji HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="188"/>
+        <location filename="../src/libsync/syncengine.cpp" line="186"/>
        <source>The mounted folder is temporarily not available on the server</source>
        <translation>Chwilowy brak dostępu do serwera, z którego montowany jest folder.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="194"/>
+        <location filename="../src/libsync/syncengine.cpp" line="192"/>
        <source>An error occurred while opening a folder</source>
        <translation>Wystąpił błąd podczas otwierania katalogu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="197"/>
+        <location filename="../src/libsync/syncengine.cpp" line="195"/>
        <source>Error while reading folder.</source>
        <translation>Błąd podczas odczytu katalogu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="477"/>
+        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="738"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1201"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1208"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="179"/>
+        <location filename="../src/libsync/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Nieokreślony błąd CSync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="182"/>
+        <location filename="../src/libsync/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Anulowane przez użytkownika</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="170"/>
+        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>CSync failed to access</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="124"/>
+        <location filename="../src/libsync/syncengine.cpp" line="122"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="167"/>
+        <location filename="../src/libsync/syncengine.cpp" line="165"/>
        <source>CSync failed due to unhandled permission denied.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>CSync tried to create a folder that already exists.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="183"/>
        <source>The service is temporarily unavailable</source>
        <translation>Usługa jest czasowo niedostępna</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="191"/>
+        <location filename="../src/libsync/syncengine.cpp" line="189"/>
        <source>Access is forbidden</source>
        <translation>Dostęp zabroniony</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="202"/>
+        <location filename="../src/libsync/syncengine.cpp" line="200"/>
        <source>An internal error number %1 occurred.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="266"/>
+        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="449"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File is listed on the ignore list.</source>
        <translation>Plik jest na liście plików ignorowanych.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="453"/>
+        <location filename="../src/libsync/syncengine.cpp" line="444"/>
        <source>File names ending with a period are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="463"/>
+        <location filename="../src/libsync/syncengine.cpp" line="454"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="466"/>
+        <location filename="../src/libsync/syncengine.cpp" line="457"/>
        <source>The file name is a reserved name on this file system.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="471"/>
+        <location filename="../src/libsync/syncengine.cpp" line="462"/>
        <source>Filename contains trailing spaces.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="474"/>
+        <location filename="../src/libsync/syncengine.cpp" line="465"/>
        <source>Filename is too long.</source>
        <translation>Nazwa pliku zbyt długa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="483"/>
+        <location filename="../src/libsync/syncengine.cpp" line="474"/>
        <source>Stat failed.</source>
        <translation>Błąd statystyk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="510"/>
+        <location filename="../src/libsync/syncengine.cpp" line="501"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="678"/>
+        <location filename="../src/libsync/syncengine.cpp" line="675"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="774"/>
+        <location filename="../src/libsync/syncengine.cpp" line="772"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nie można zainicjować synchronizacji dziennika.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="793"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="830"/>
+        <location filename="../src/libsync/syncengine.cpp" line="828"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Nie można czytać z dziennika synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="875"/>
+        <location filename="../src/libsync/syncengine.cpp" line="873"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="933"/>
+        <location filename="../src/libsync/syncengine.cpp" line="930"/>
        <source>File name contains at least one invalid character</source>
        <translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1160"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1167"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1186"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1227"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1249"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1243"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1275"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokalne pliki i udostępniane foldery zostały usunięte.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1331"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1342"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1343"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -3632,12 +3656,6 @@ Kliknij</translation>
        <source>Some time ago</source>
        <translation>Jakiś czas temu</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/syncresult.cpp" line="144"/>
-        <source>%1: %2</source>
-        <extracomment>this displays an error string (%2) for a file %1</extracomment>
-        <translation>%1: %2</translation>
-    </message>
 </context>
 <context>
    <name>Utility</name>
--- a/Mostrar Mais
+++ b/Mostrar Mais