Merge remote-tracking branch 'origin/master' into 2.3

We can do that because the only changes that were in master but not in 2.3 were the
translations change and documentation change, and the support for the 'M' permission
which we want in 2.3.

diff --cc src/gui/folder.cpp
index 6aa0fe2fb4da954a39e8fec32bbc0c5cc9cb62a0,1d6b3ac5822bb844c8845495382390d339af5489..6b0e0ff1c0ea8a9f1d1f232a54e73738be03c2e3
--- 1/src/gui/folder.cpp
--- 2/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@@ -99,9 -102,10 +99,10 @@@ Folder::Folder(const FolderDefinition& 
              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 SyncFileItem &, const PropagatorJob &)),
 -            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
 +    connect(_engine.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
 +            this, SLOT(slotItemCompleted(const SyncFileItemPtr &)));
-     connect(_engine.data(), SIGNAL(newBigFolder(QString)), this, SLOT(slotNewBigFolderDiscovered(QString)));
+     connect(_engine.data(), SIGNAL(newBigFolder(QString,bool)),
+             this, SLOT(slotNewBigFolderDiscovered(QString,bool)));
      connect(_engine.data(), SIGNAL(seenLockedFile(QString)), FolderMan::instance(), SLOT(slotSyncOnceFileUnlocks(QString)));
      connect(_engine.data(), SIGNAL(aboutToPropagate(SyncFileItemVector&)),
              SLOT(slotLogPropagationStart()));
@@@ -806,23 -921,17 +809,23 @@@ void Folder::slotTransmissionProgress(c
  }
  
  // a item is completed: count the errors and forward to the ProgressDispatcher
 -void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& job)
 +void Folder::slotItemCompleted(const SyncFileItemPtr &item)
  {
 -    if (Progress::isWarningKind(item._status)) {
 -        // Count all error conditions.
 -        _syncResult.setWarnCount(_syncResult.warnCount()+1);
 +    // 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 );
      }
 -    _fileLog->logItem(item);
 -    emit ProgressDispatcher::instance()->itemCompleted(alias(), item, job);
 +    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);
  }
  
- void Folder::slotNewBigFolderDiscovered(const QString &newF)
+ void Folder::slotNewBigFolderDiscovered(const QString &newF, bool isExternal)
  {
      auto newFolder = newF;
      if (!newFolder.endsWith(QLatin1Char('/'))) {

diff --cc src/gui/folder.h
index 6c4b73c2d9cef44d15a681feabfa802450bcfd68,57a618b006e1be4a1d7910033575d3dae02a7647..4cff4135712b76b812eab39b678be2f2d70e1dd3
--- 1/src/gui/folder.h
--- 2/src/gui/folder.h
+++ b/src/gui/folder.h
@@@ -286,9 -286,11 +286,9 @@@ private slots
      void etagRetreived(const QString &);
      void etagRetreivedFromSyncEngine(const QString &);
  
 -    void slotThreadTreeWalkResult(const SyncFileItemVector& ); // after sync is done
 -
      void slotEmitFinishedDelayed();
  
-     void slotNewBigFolderDiscovered(const QString &);
+     void slotNewBigFolderDiscovered(const QString &, bool isExternal);
  
      void slotLogPropagationStart();
  

diff --cc src/gui/folderstatusmodel.cpp
Simple merge

diff --cc src/libsync/syncengine.cpp
Simple merge

diff --cc src/libsync/syncengine.h
Simple merge