Fix typo in folder.cpp

Undo regression caused by 727e73d
normalization to NFC is still required. Mac OS API will not take care of that by default. Resolves #4884
2016-05-27 18:13:51 +02:00 · 2016-05-27 16:03:59 +02:00 · 2016-05-27 12:08:42 +02:00 · 2016-05-27 10:52:00 +02:00 · 2016-05-27 02:19:21 -04:00 · 2016-05-26 12:17:16 +02:00
@@ -1,15 +1,21 @@
+sudo: required
+
 language: cpp
+
+services:
+  - docker
+
 branches:
  only:
  - coverity_scan 

 before_install:
- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
 - sudo apt-key add - < Release.key
 - sudo apt-get update
- sudo apt-get build-dep owncloud-client
+- sudo apt-get -y build-dep owncloud-client
 - checkout=$(git show-ref --head --hash head)
 - cd ../
 - wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
@@ -1,3 +1,4 @@
+
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.8.0)

@@ -125,6 +126,17 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()

+# When this option is enabled, a rename that is not allowed will be renamed back
+# do the original as a restoration step.  Withut this option, the restoration will
+# re-download the file instead.
+# The default is off because we don't want to rename the files back behind the user's back
+# Added for IL issue #550
+option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF)
+if(OWNCLOUD_RESTORE_RENAME)
+    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
+endif()
+
+
 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
@@ -151,11 +163,6 @@ endif()

 find_package(ZLIB)

-find_package(LibsnoreQt5 0.6.0)
-if(LibsnoreQt5_FOUND)
-   find_package(LibsnoreSettingsQt5)
-endif()
-
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

 configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
@@ -1,5 +1,33 @@
 ChangeLog
 =========
+version 2.2.1 (release 2016-05-xx)
+ * Fix out of memory error when too many uploads happen (#4611)
+ * Fix display errors in progress display (#4803 #4856)
+ * LockWatcher: Remember to upload files after they become unlocked (#4865) 
+
+version 2.2.0 (release 2016-05-12)
+ * Overlay icons: Refactoring - mainly for performance improvements
+ * Improved error handling with Sync Journal on USB storages (#4632)
+ * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
+ * Show server notifications on the client (#3733)
+ * Improved Speed with small files by dynamic parallel request count (#4529)
+ * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
+ * Improved handling of Win32 file locks and network files
+ * Workaround Ubuntu 16.04 tray icon bug (#4693)
+ * Removed the Alias field from the folder definition (#4695)
+ * Improved netrc parser (#4691)
+ * Improved user notifications about ignored files and conflicts (#4761, #3222)
+ * Add warnings for old server versions (#4523)
+ * Enable tranportation checksums if the server supports based on server capabilities (#3735)
+
+ * Default Chunk-size changed to 10MB (#4354)
+ * Documentation Improvements, ie. about overlay icons
+ * Translation fixes
+ * Countless other bugfixes
+ * Sqlite Update to recent version
+ * Update of QtKeyChain to support Windows credential store
+ * Packaging of dolphin overlay icon module for bleeding edge distros
+
 version 2.1.1 (release 2016-02-10)
 * UI improvements for HiDPI screens, error messages, RTL languages
 * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 2 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

@@ -270,6 +270,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

    if(_last_db_return_error(ctx)) {
        SAFE_FREE(st);
+        SAFE_FREE(tmp);
        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
        return -1;
    }
@@ -41,7 +41,7 @@ master_doc = 'index'

 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2013, The ownCloud developers'
+copyright = u'2013-2016, The ownCloud developers'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -250,7 +250,7 @@ texinfo_documents = [
 epub_title = u'ownCloud Client Manual'
 epub_author = u'The ownCloud developers'
 epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2013, The ownCloud developers'
+epub_copyright = u'2013-2016, The ownCloud developers'

 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -4,16 +4,16 @@ ownCloud Desktop Client Manual
 ==============================

 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2

   introduction
   installing
   navigating
   advancedusage
   autoupdate
-
   building 
   architecture
   troubleshooting
   faq
-   glossary
+   glossary
+   
@@ -12,26 +12,22 @@ Desktop Sync client enables you to:
 Your files are always automatically synchronized between your ownCloud server 
 and local PC.

-.. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not allowed to connect and sync with the ownCloud 8.1+ server. It 
-   is highly recommended to keep your client updated.
-   
+Because of various technical issues, desktop sync clients older than 1.7 will 
+not allowed to connect and sync with the ownCloud 8.1+ server. It is highly 
+recommended to keep your client updated.
+
 Improvements and New Features
 -----------------------------

-The 2.1 release of the ownCloud desktop sync client has many new features and 
+The 2.2 release of the ownCloud desktop sync client has many new features and 
 improvements. (See the `complete changelog 
 <https://owncloud.org/changelog/desktop/>`_.)
 
-  * Improved appearance on HiDPI screens
-  * Improved error messages
-  * Several fixes/improvements to the sharing dialog
-  * Several fixes/improvements to the server activity tab
-  * Allow changeable upload chunk size in owncloud.cfg
-  * Forget password on explicit sign-out
-  * Windows: Fix deleting and replacing of read-only files
-  * Share with internal ownCloud users from your desktop
-  * Separate views for server activity, sync activity, and errors
-  * Don't re-upload *eml-files if size and checksum are unchanged
-  * Improved upload/download progress indicator
+  * Show server notifications on the client
+  * Improved sync speed
+  * Improved handling of Win32 file locks and network files 
+  * Improved user notifications about ignored files and conflicts
+  * Add warnings for old server versions
+  * Update of QtKeyChain to support Windows credential store
+  * Packaging of dolphin overlay icon module for bleeding edge distros
  
@@ -62,6 +62,7 @@ This menu provides the following options:
 * Recent Changes, showing latest activities
 * Settings
 * Help menu
+* Pause synchronizations
 * An option to log in or log out of all of your accounts at once
 * Quit ownCloud, logging out and closing the client

@@ -83,7 +84,7 @@ have the following features:
 * Connection status, showing which ownCloud server you are connected to, and 
  your ownCloud username.
 * An **Account** button, which contains a dropdown menu with **Add New**, 
-  **Log In/Log Out**, and **Remove**.
+  **Log Out**, and **Remove**.
 * Used and available space on the server.
 * Current synchronization status.
 * **Add Folder Sync Connection** button, which is active only when you have 
@@ -93,26 +94,17 @@ The little button with three dots (the overflow menu) that sits to the right of
 the sync status bar offers four additional options:

 * Open Folder
-* Choose What to Sync
+* Choose What to Sync (This appears only when your file tree is collapsed, and 
+  expands the file tree)
 * Pause Sync / Resume Sync
 * Remove folder sync connection

-**Open Folder** opens a file explorer window displaying the client-side folder
-that is being synced.
-
-**Choose What to Sync** opens the folder sync tree view. Use this to sync all 
-or only some of the folders in the folder tree.
+**Open Folder** opens your local ownCloud sync folder.

 **Pause Sync** pauses sync operations without making any changes to your 
 account. It will continue to update file and folder lists, without 
-downloading or updating files. To stop all sync activity use **Remove Sync**.
-
-**Resume Sync** resumes sync operations.
-
-**Remove Sync** removes the sync connection without removing the account. This 
-stops all sync activity, including file and folder list updates. If you want to 
-synchronize the folder tree again then click the **Add Folder Sync Connection** 
-button, and re-select the folder tree that you want to sync.
+downloading or updating files. To stop all sync activity use **Remove 
+Folder Sync Connection**.

 .. figure:: images/client-7.png
   :alt: Extra options for sync operations
@@ -125,12 +117,10 @@ button, and re-select the folder tree that you want to sync.
 Adding New Accounts
 ^^^^^^^^^^^^^^^^^^^

-You may configure multiple ownCloud accounts in your desktop sync client. 
-Simply 
+You may configure multiple ownCloud accounts in your desktop sync client. Simply 
 click the **Account** > **Add New** button on any account tab to add a new 
 account, and then follow the account creation wizard. The new account will 
-appear as a new tab in the settings dialog, where you can adjust its settings 
-at 
+appear as a new tab in the settings dialog, where you can adjust its settings at 
 any time. Use **Account** > **Remove** to delete accounts. 

 File Manager Overlay Icons
@@ -175,9 +165,7 @@ the ``owncloud-client-nautilus`` plugin.) You can create share links, and share
 with internal ownCloud users the same way as in your ownCloud Web interface.

 .. figure:: images/mac-share.png
-   :alt: Sync client integration in Finder on Mac OS X.
-   
-   *Shared ownCloud files in Finder on Mac OS X*
+   :alt: Sync client integration in Windows Explorer.
   
 Right-click your systray icon, hover over the account you want to use, and 
 left-click "Open folder [folder name] to quickly enter your local ownCloud 
@@ -206,6 +194,25 @@ such as files not synced.

 .. figure:: images/client-8.png
   :alt: Activity windows logs all server and client activities.
+   
+Server Notifications
+--------------------
+
+Starting with version 2.2.0, the client will display notifications from your 
+ownCloud server that require manual interaction by you. For example, when a 
+user on a remote ownCloud creates a new Federated share for you, you can accept 
+it from your desktop client.
+
+The desktop client automatically checks for available notifications 
+automatically on a regular basis. Notifications are displayed in the Server 
+Activity tab, and if you have **Show Desktop Notifications** enabled (General 
+tab) you'll also see a systray notification.
+
+.. figure:: images/client12.png
+   :alt: Activity window with notification.
+
+This also displays notifications sent to users by the ownCloud admin via the 
+Announcements app.

 General Window
 --------------
@@ -11,11 +11,101 @@ X-GNOME-Autostart-Delay=3


 # Translations
-Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-GenericName[sq]=Njëkohësim Dosjesh
-Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-Icon[sq]=@APPLICATION_EXECUTABLE@
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[oc]=@APPLICATION_EXECUTABLE@
+Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+GenericName[ca]=Sincronització de carpetes
+Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+Icon[ca]=@APPLICATION_EXECUTABLE@
+Comment[da]=@APPLICATION_NAME@ skrivebordsklient til synkronisering
+GenericName[da]=Mappesynkronisering
+Name[da]=@APPLICATION_NAME@ skrivebordsklient til synk
+Icon[da]=@APPLICATION_EXECUTABLE@
+Comment[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de]=Ordner-Synchronisation
+Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de]=@APPLICATION_EXECUTABLE@
+Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
+GenericName[en_GB]=Folder Sync
+Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
+Icon[en_GB]=@APPLICATION_EXECUTABLE@
+Comment[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+GenericName[es]=Sincronización de carpeta
+Name[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+Icon[es]=@APPLICATION_EXECUTABLE@
+Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de_DE]=Ordner-Synchronisation
+Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de_DE]=@APPLICATION_EXECUTABLE@
+Comment[fr]=@APPLICATION_NAME@ synchronisation du client
+GenericName[fr]=Dossier de Synchronisation
+Name[fr]=@APPLICATION_NAME@ synchronisation du client
+Icon[fr]=@APPLICATION_EXECUTABLE@
+Comment[id]=Klien sinkronisasi desktop @APPLICATION_NAME@
+GenericName[id]=Folder Sync
+Name[id]=Klien sync desktop @APPLICATION_NAME@
+Icon[id]=@APPLICATION_EXECUTABLE@
+Comment[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
+GenericName[it]=Sincronizzazione cartella
+Name[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
+Icon[it]=@APPLICATION_EXECUTABLE@
+Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
+GenericName[ko]=폴더 동기화
+Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 Comment[nl]=@APPLICATION_NAME@ desktop synchronisatie client
 GenericName[nl]=Mappen sync
 Name[nl]=@APPLICATION_NAME@ desktop sync client 
 Icon[nl]=@APPLICATION_EXECUTABLE@
+Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
+GenericName[bg_BG]=Синхронизиране на папката
+Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
+Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização do computador
+GenericName[pt_BR]=Sincronização de Pasta
+Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização de desktop
+Icon[pt_BR]=@APPLICATION_EXECUTABLE@
+Comment[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+GenericName[cs_CZ]=Synchronizace adresáře
+Name[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
+Comment[ru]=@НАЗВАНИЕ_ПРИЛОЖЕНИЯ@ Клиент синхронизации
+GenericName[ru]=Синхронизация папки
+Name[ru]=@НАЗВАНИЕ_ПРИЛОЖЕНИЯ@ Клиент синхронизации
+Icon[ru]=@ВЫПОЛНЯЕМОЕ_ПРИЛОЖЕНИЕ@
+Comment[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+GenericName[sl]=Usklajevanje map
+Name[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+Icon[sl]=@APPLICATION_EXECUTABLE@
+Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+GenericName[sq]=Njëkohësim Dosjesh
+Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+Icon[sq]=@APPLICATION_EXECUTABLE@
+Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+GenericName[ja_JP]=フォルダ同期
+Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+Comment[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+GenericName[ro]=Sincronizare director
+Name[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+Icon[ro]=@APPLICATION_EXECUTABLE@
+GenericName[zh_CN]=文件夹同步
+GenericName[zh_TW]=資料夾同步
+Comment[pt_PT]=@APPLICATION_NAME@ cliente de sincronização para ambiente de trabalho
+GenericName[pt_PT]=Sincronizar Pasta
+Name[pt_PT]=@APPLICATION_NAME@ cliente de sincronização para ambiente de trabalho
+Icon[pt_PT]=@APPLICATION_EXECUTABLE@
+Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
+Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+Icon[th_TH]=@APPLICATION_EXECUTABLE@
@@ -36,8 +36,7 @@ using namespace std;

 OCClientInterface::ContextMenuInfo OCClientInterface::FetchInfo()
 {
-	auto pipename = std::wstring(L"\\\\.\\pipe\\");
-	pipename += L"ownCloud";
+	auto pipename = CommunicationSocket::DefaultPipePath();

 	CommunicationSocket socket;
 	if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
@@ -72,8 +71,7 @@ OCClientInterface::ContextMenuInfo OCClientInterface::FetchInfo()

 void OCClientInterface::ShareObject(const std::wstring &path)
 {
-	auto pipename = std::wstring(L"\\\\.\\pipe\\");
-	pipename += L"ownCloud";
+	auto pipename = CommunicationSocket::DefaultPipePath();

 	CommunicationSocket socket;
 	if (!WaitNamedPipe(pipename.data(), PIPE_TIMEOUT)) {
@@ -24,11 +24,31 @@

 #include <fstream> 

-#define BUFSIZE 1024
+#define DEFAULT_BUFLEN 4096

 using namespace std;

-#define DEFAULT_BUFLEN 4096
+namespace {
+
+std::wstring getUserName() {
+	DWORD  len = DEFAULT_BUFLEN;
+	TCHAR  buf[DEFAULT_BUFLEN];
+	if (GetUserName(buf, &len)) {
+		return std::wstring(&buf[0], len);
+	} else {
+		return std::wstring();
+	}
+}
+
+}
+
+std::wstring CommunicationSocket::DefaultPipePath()
+{
+	auto pipename = std::wstring(L"\\\\.\\pipe\\");
+	pipename += L"ownCloud\\";
+	pipename += getUserName();
+	return pipename;
+}

 CommunicationSocket::CommunicationSocket()
    : _pipe(INVALID_HANDLE_VALUE)
@@ -26,6 +26,8 @@
 class __declspec(dllexport) CommunicationSocket
 {
 public:
+	static std::wstring DefaultPipePath();
+
 	CommunicationSocket();
 	~CommunicationSocket();

@@ -43,4 +45,4 @@ private:
    bool _connected;
 };

-#endif
+#endif
@@ -31,25 +31,10 @@

 using namespace std;

-#define BUFSIZE 512
-
-std::wstring getUserName() {
-    DWORD  len = BUFSIZE;
-    TCHAR  buf[BUFSIZE];
-    if (GetUserName(buf, &len)) {
-        return std::wstring(&buf[0], len);
-    } else {
-        return std::wstring();
-    }
-}
-
 // This code is run in a thread
 void RemotePathChecker::workerThreadLoop()
 {
-    auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud\\";
-    pipename += getUserName();
-
+    auto pipename = CommunicationSocket::DefaultPipePath();
    bool connected = false;
    CommunicationSocket socket;
    std::unordered_set<std::wstring> asked;
@@ -28,16 +28,12 @@
 * \return string PEM
 */
 string x509ToString(BIO *o) {
-    int len = 0;
    BUF_MEM *bptr;
-    void* data;
-    string ret = "";
-    
    BIO_get_mem_ptr(o, &bptr);
-    len = bptr->length;
-    data = calloc(len+10, sizeof(char));
+    int len = bptr->length;
+    void* data = calloc(len+10, sizeof(char));
    BIO_read(o, data, len);
-    ret = strdup((char*)data);
+    string ret = std::string(static_cast<char*>(data));
    free(data);
        
    return ret;
@@ -45,7 +45,7 @@ qt_wrap_ui(client_UI_SRCS ${client_UI})
 set(client_SRCS
    accountmanager.cpp
    accountsettings.cpp
-    ocapplication.cpp
+    application.cpp
    folder.cpp
    folderman.cpp
    folderstatusmodel.cpp
@@ -212,10 +212,6 @@ if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND)
    list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
    include_directories(${QTKEYCHAIN_INCLUDE_DIR})
 endif()
-if(LibsnoreQt5_FOUND)
-    add_definitions(-DHAVE_LIBSNORE)
-
-endif()

 # add executable icon on windows and osx
 include( AddAppIconMacro )
@@ -293,7 +289,6 @@ target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
-target_link_libraries( ${APPLICATION_EXECUTABLE} Snore::Libsnore Snore::LibsnoreSettings )

 if(WITH_CRASHREPORTER)
    target_link_libraries( ${APPLICATION_EXECUTABLE} crashreporter-handler)
@@ -21,7 +21,7 @@
 #include "folderstatusmodel.h"
 #include "folderstatusdelegate.h"
 #include "utility.h"
-#include "ocapplication.h"
+#include "application.h"
 #include "configfile.h"
 #include "account.h"
 #include "accountstate.h"
@@ -41,7 +41,7 @@ class ActivityListModel;
 namespace Ui {
  class ActivityWidget;
 }
-class oCApplication;
+class Application;

 /**
 * @brief The ActivityWidget class
@@ -14,7 +14,7 @@
 * for more details.
 */

-#include "ocapplication.h"
+#include "application.h"

 #include <iostream>

@@ -91,7 +91,7 @@ QString applicationTrPath()

 // ----------------------------------------------------------------------------------

-oCApplication::oCApplication(int &argc, char **argv) :
+Application::Application(int &argc, char **argv) :
    SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
    _gui(0),
    _theme(Theme::instance()),
@@ -202,7 +202,7 @@ oCApplication::oCApplication(int &argc, char **argv) :
    connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
 }

-oCApplication::~oCApplication()
+Application::~Application()
 {
    // Make sure all folders are gone, otherwise removing the
    // accounts will remove the associated folders from the settings.
@@ -214,7 +214,7 @@ oCApplication::~oCApplication()
    AccountManager::instance()->shutdown();
 }

-void oCApplication::slotAccountStateRemoved(AccountState *accountState)
+void Application::slotAccountStateRemoved(AccountState *accountState)
 {
    if (_gui) {
        disconnect(accountState, SIGNAL(stateChanged(int)),
@@ -237,7 +237,7 @@ void oCApplication::slotAccountStateRemoved(AccountState *accountState)
    }
 }

-void oCApplication::slotAccountStateAdded(AccountState *accountState)
+void Application::slotAccountStateAdded(AccountState *accountState)
 {
    connect(accountState, SIGNAL(stateChanged(int)),
            _gui, SLOT(slotAccountStateChanged()));
@@ -251,7 +251,7 @@ void oCApplication::slotAccountStateAdded(AccountState *accountState)
    _gui->slotTrayMessageIfServerUnsupported(accountState->account().data());
 }

-void oCApplication::slotCleanup()
+void Application::slotCleanup()
 {
    AccountManager::instance()->save();
    FolderMan::instance()->unloadAndDeleteAllFolders();
@@ -263,7 +263,7 @@ void oCApplication::slotCleanup()
 // FIXME: This is not ideal yet since a ConnectionValidator might already be running and is in
 // progress of timing out in some seconds.
 // Maybe we need 2 validators, one triggered by timer, one by network configuration changes?
-void oCApplication::slotSystemOnlineConfigurationChanged(QNetworkConfiguration cnf)
+void Application::slotSystemOnlineConfigurationChanged(QNetworkConfiguration cnf)
 {
    if (cnf.state() & QNetworkConfiguration::Active) {
        //qDebug() << "Trying fast reconnect";
@@ -271,7 +271,7 @@ void oCApplication::slotSystemOnlineConfigurationChanged(QNetworkConfiguration c
    }
 }

-void oCApplication::slotCheckConnection()
+void Application::slotCheckConnection()
 {
    auto list = AccountManager::instance()->accounts();
    foreach (const auto &accountState , list) {
@@ -293,12 +293,12 @@ void oCApplication::slotCheckConnection()
    }
 }

-void oCApplication::slotCrash()
+void Application::slotCrash()
 {
    Utility::crash();
 }

-void oCApplication::slotownCloudWizardDone( int res )
+void Application::slotownCloudWizardDone( int res )
 {
    AccountManager *accountMan = AccountManager::instance();
    FolderMan *folderMan = FolderMan::instance();
@@ -335,7 +335,7 @@ void oCApplication::slotownCloudWizardDone( int res )
    }
 }

-void oCApplication::setupLogging()
+void Application::setupLogging()
 {
    // might be called from second instance
    Logger::instance()->setLogFile(_logFile);
@@ -352,12 +352,12 @@ void oCApplication::setupLogging()

 }

-void oCApplication::slotUseMonoIconsChanged(bool)
+void Application::slotUseMonoIconsChanged(bool)
 {
    _gui->slotComputeOverallSyncStatus();
 }

-void oCApplication::slotParseMessage(const QString &msg, QObject*)
+void Application::slotParseMessage(const QString &msg, QObject*)
 {
    if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) {
        const int lengthOfMsgPrefix = 17;
@@ -375,7 +375,7 @@ void oCApplication::slotParseMessage(const QString &msg, QObject*)
    }
 }

-void oCApplication::parseOptions(const QStringList &options)
+void Application::parseOptions(const QStringList &options)
 {
    QStringListIterator it(options);
    // skip file name;
@@ -455,7 +455,7 @@ static void displayHelpText(const QString &t)
 }
 #endif

-void oCApplication::showHelp()
+void Application::showHelp()
 {
    setHelp();
    QString helpText;
@@ -473,7 +473,7 @@ void oCApplication::showHelp()
    displayHelpText(helpText);
 }

-void oCApplication::showVersion()
+void Application::showVersion()
 {
    QString helpText;
    QTextStream stream(&helpText);
@@ -485,7 +485,7 @@ void oCApplication::showVersion()
    displayHelpText(helpText);
 }

-void oCApplication::showHint(std::string errorHint)
+void Application::showHint(std::string errorHint)
 {
    static QString binName = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
    std::cerr << errorHint << std::endl;
@@ -493,12 +493,12 @@ void oCApplication::showHint(std::string errorHint)
    std::exit(1);
 }

-bool oCApplication::debugMode()
+bool Application::debugMode()
 {
    return _debugMode;
 }

-void oCApplication::setHelp()
+void Application::setHelp()
 {
    _helpOnly = true;
 }
@@ -518,7 +518,7 @@ QString substLang(const QString &lang)
    return lang;
 }

-void oCApplication::setupTranslations()
+void Application::setupTranslations()
 {
    QStringList uiLanguages;
    // uiLanguages crashes on Windows with 4.8.0 release builds
@@ -582,20 +582,21 @@ void oCApplication::setupTranslations()
 #endif
 }

-bool oCApplication::giveHelp()
+bool Application::giveHelp()
 {
    return _helpOnly;
 }

-bool oCApplication::versionOnly()
+bool Application::versionOnly()
 {
    return _versionOnly;
 }

-void oCApplication::showSettingsDialog()
+void Application::showSettingsDialog()
 {
    _gui->slotShowSettings();
 }


 } // namespace OCC
+
@@ -12,8 +12,8 @@
 * for more details.
 */

-#ifndef OCAPPLICATION_H
-#define OCAPPLICATION_H
+#ifndef APPLICATION_H
+#define APPLICATION_H

 #include <QApplication>
 #include <QPointer>
@@ -49,12 +49,12 @@ class SslErrorDialog;
 * @brief The Application class
 * @ingroup gui
 */
-class oCApplication : public SharedTools::QtSingleApplication
+class Application : public SharedTools::QtSingleApplication
 {
    Q_OBJECT
 public:
-    explicit oCApplication(int &argc, char **argv);
-    ~oCApplication();
+    explicit Application(int &argc, char **argv);
+    ~Application();

    bool giveHelp();
    void showHelp();
@@ -38,7 +38,12 @@ namespace OCC

 class UserAgentWebPage : public QWebPage {
 public:
-    UserAgentWebPage(QObject *parent) : QWebPage(parent) {}
+    UserAgentWebPage(QObject *parent) : QWebPage(parent)
+    {
+        if (!qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty()) {
+            settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        }
+    }
    QString userAgentForUrl(const QUrl &url ) const {
        return QWebPage::userAgentForUrl(url) + " " + Utility::userAgentString();
    }
@@ -915,7 +915,7 @@ void Folder::slotFolderDiscovered(bool, QString folderName)
 // and hand the result over to the progress dispatcher.
 void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 {
-    if( !pi.hasStarted() ) {
+    if( !pi.isUpdatingEstimates() ) {
        // this is the beginning of a sync, set the warning level to 0
        _syncResult.setWarnCount(0);
    }
@@ -1001,7 +1001,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
 void Folder::slotAboutToRestoreBackup(bool *restore)
 {
    QString msg =
-        tr("This sync would reset the files to an erlier time in the sync folder '%1'.\n"
+        tr("This sync would reset the files to an earlier time in the sync folder '%1'.\n"
           "This might be because a backup was restored on the server.\n"
           "Continuing the sync as normal will cause all your files to be overwritten by an older "
           "file in an earlier state. "
@@ -29,7 +29,7 @@ class TestFolderMan;

 namespace OCC {

-class oCApplication;
+class Application;
 class SyncResult;
 class SocketApi;
 class LockWatcher;
@@ -255,7 +255,7 @@ private:

    static FolderMan *_instance;
    explicit FolderMan(QObject *parent = 0);
-    friend class OCC::oCApplication;
+    friend class OCC::Application;
    friend class ::TestFolderMan;
 };

@@ -68,13 +68,6 @@ FolderWizardLocalPath::FolderWizardLocalPath()
    _ui.localFolderLineEdit->setText( QDir::toNativeSeparators( defaultPath ) );
    _ui.localFolderLineEdit->setToolTip(tr("Enter the path to the local folder."));

-    QString newAlias = Theme::instance()->appName();
-    int count = 0;
-    while (FolderMan::instance()->folder(newAlias)) {
-        // There is already a folder configured with this name and folder names need to be unique
-        newAlias = Theme::instance()->appName() + QString::number(++count);
-    }
-
    _ui.warnLabel->setTextFormat(Qt::RichText);
    _ui.warnLabel->hide();
 }
@@ -135,14 +128,6 @@ void FolderWizardLocalPath::slotChooseLocalFolder()
    if (!dir.isEmpty()) {
        // set the last directory component name as alias
        _ui.localFolderLineEdit->setText(QDir::toNativeSeparators(dir));
-
-        QDir pickedDir(dir);
-        QString newAlias = pickedDir.dirName();
-        int count = 0;
-        while (FolderMan::instance()->folder(newAlias)) {
-            // There is already a folder configured with this name and folder names need to be unique
-            newAlias = pickedDir.dirName() + QString::number(++count);
-        }
    }
    emit completeChanged();
 }
@@ -503,11 +488,13 @@ FolderWizardSelectiveSync::~FolderWizardSelectiveSync()

 void FolderWizardSelectiveSync::initializePage()
 {
-    QString alias        = wizard()->field(QLatin1String("alias")).toString();
    QString targetPath   = wizard()->property("targetPath").toString();
    if (targetPath.startsWith('/')) {
        targetPath = targetPath.mid(1);
    }
+    QString alias        = QFileInfo(targetPath).fileName();
+    if (alias.isEmpty())
+        alias = Theme::instance()->appName();
    _treeView->setFolderInfo(targetPath, alias);
    QWizardPage::initializePage();
 }
@@ -520,8 +507,10 @@ bool FolderWizardSelectiveSync::validatePage()

 void FolderWizardSelectiveSync::cleanupPage()
 {
-    QString alias        = wizard()->field(QLatin1String("alias")).toString();
    QString targetPath   = wizard()->property("targetPath").toString();
+    QString alias        = QFileInfo(targetPath).fileName();
+    if (alias.isEmpty())
+        alias = Theme::instance()->appName();
    _treeView->setFolderInfo(targetPath, alias);
    QWizardPage::cleanupPage();
 }
@@ -16,7 +16,7 @@

 #include "theme.h"
 #include "configfile.h"
-#include "ocapplication.h"
+#include "application.h"
 #include "utility.h"
 #include "configfile.h"
 #include "owncloudsetupwizard.h"
@@ -21,7 +21,7 @@
 #include <sys/resource.h>
 #endif

-#include "ocapplication.h"
+#include "application.h"
 #include "theme.h"
 #include "utility.h"
 #include "cocoainitializer.h"
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 #ifdef Q_OS_MAC
    Mac::CocoaInitializer cocoaInit; // RIIA
 #endif
-    OCC::oCApplication app(argc, argv);
+    OCC::Application app(argc, argv);

 #ifdef Q_OS_WIN
    // The Windows style still has pixelated elements with Qt 5.6,
@@ -16,7 +16,7 @@

 #include "theme.h"
 #include "configfile.h"
-#include "ocapplication.h"
+#include "application.h"
 #include "utility.h"
 #include "configfile.h"
 #include "folderman.h"
@@ -11,7 +11,7 @@
 * for more details.
 */

-#include "ocapplication.h"
+#include "application.h"
 #include "owncloudgui.h"
 #include "theme.h"
 #include "folderman.h"
@@ -47,7 +47,7 @@ namespace OCC {

 const char propertyAccountC[] = "oc_account";

-ownCloudGui::ownCloudGui(oCApplication *parent) :
+ownCloudGui::ownCloudGui(Application *parent) :
    QObject(parent),
    _tray(0),
 #if defined(Q_OS_MAC)
@@ -96,10 +96,10 @@ ownCloudGui::ownCloudGui(oCApplication *parent) :
    connect( AccountManager::instance(), SIGNAL(accountRemoved(AccountState*)),
             SLOT(setupContextMenu()));

-    connect( Logger::instance(), SIGNAL(guiLog(QString,QString, Logger::NotificationType)),
-             SLOT(slotShowTrayMessage(QString,QString, Logger::NotificationType)));
-    connect( Logger::instance(), SIGNAL(optionalGuiLog(QString,QString, Logger::NotificationType)),
-             SLOT(slotShowOptionalTrayMessage(QString,QString,Logger::NotificationType)));
+    connect( Logger::instance(), SIGNAL(guiLog(QString,QString)),
+             SLOT(slotShowTrayMessage(QString,QString)));
+    connect( Logger::instance(), SIGNAL(optionalGuiLog(QString,QString)),
+             SLOT(slotShowOptionalTrayMessage(QString,QString)));
    connect( Logger::instance(), SIGNAL(guiMessage(QString,QString)),
             SLOT(slotShowGuiMessage(QString,QString)));

@@ -237,8 +237,7 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account* account)
                tr("The server on account %1 runs an old and unsupported version %2. "
                   "Using this client with unsupported server versions is untested and "
                   "potentially dangerous. Proceed at your own risk.")
-                    .arg(account->displayName(), account->serverVersion()),
-                    Logger::Critical );
+                    .arg(account->displayName(), account->serverVersion()));
    }
 }

@@ -536,36 +535,19 @@ void ownCloudGui::setupContextMenu()
 }


-void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type)
+void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg)
 {
-    if( _tray ) {
-        QSystemTrayIcon::MessageIcon trayIcon = QSystemTrayIcon::NoIcon;
-        switch( type ) {
-        case Logger::NoIcon:
-            break;
-        case Logger::Information:
-            trayIcon = QSystemTrayIcon::Information;
-            break;
-        case Logger::SoftError:
-            trayIcon = QSystemTrayIcon::Warning;
-            break;
-        case Logger::Error:
-        case Logger::Critical:
-            trayIcon = QSystemTrayIcon::Critical;
-            break;
-        }
-
-        _tray->showMessage(title, msg, trayIcon);
-    } else {
+    if( _tray )
+        _tray->showMessage(title, msg);
+    else
        qDebug() << "Tray not ready: " << msg;
-    }
 }

-void ownCloudGui::slotShowOptionalTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type)
+void ownCloudGui::slotShowOptionalTrayMessage(const QString &title, const QString &msg)
 {
    ConfigFile cfg;
    if (cfg.optionalDesktopNotifications()) {
-        slotShowTrayMessage(title, msg, type);
+        slotShowTrayMessage(title, msg);
    }
 }

@@ -703,7 +685,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
        slotRebuildRecentMenus();
    }

-    if (progress.hasStarted()
+    if (progress.isUpdatingEstimates()
            && progress.completedFiles() >= progress.totalFiles()
            && progress._currentDiscoveredFolder.isEmpty()) {
        QTimer::singleShot(2000, this, SLOT(slotDisplayIdle()));
@@ -17,7 +17,6 @@
 #include "systray.h"
 #include "connectionvalidator.h"
 #include "progressdispatcher.h"
-#include "logger.h"

 #include <QObject>
 #include <QPointer>
@@ -33,7 +32,7 @@ class Folder;
 class SettingsDialog;
 class SettingsDialogMac;
 class ShareDialog;
-class oCApplication;
+class Application;
 class LogBrowser;
 class AccountState;

@@ -45,7 +44,7 @@ class ownCloudGui : public QObject
 {
    Q_OBJECT
 public:
-    explicit ownCloudGui(oCApplication *parent = 0);
+    explicit ownCloudGui(Application *parent = 0);

    bool checkAccountExists(bool openSettings);

@@ -59,8 +58,8 @@ signals:
 public slots:
    void setupContextMenu();
    void slotComputeOverallSyncStatus();
-    void slotShowTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type);
-    void slotShowOptionalTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type);
+    void slotShowTrayMessage(const QString &title, const QString &msg);
+    void slotShowOptionalTrayMessage(const QString &title, const QString &msg);
    void slotFolderOpenAction( const QString& alias );
    void slotRebuildRecentMenus();
    void slotUpdateProgress(const QString &folder, const ProgressInfo& progress);
@@ -123,7 +122,7 @@ private:
    QSignalMapper *_folderOpenActionMapper;
    QSignalMapper *_recentItemsMapper;

-    oCApplication *_app;
+    Application *_app;
 };

 } // namespace OCC
@@ -173,7 +173,7 @@ void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)

    // Allow the credentials dialog to pop up again for the same URL.
    // Maybe the user just clicked 'Cancel' by accident or changed his mind.
-    _ocWizard->account()->resetSslCertErrorState();
+    _ocWizard->account()->resetRejectedCertificates();
 }

 void OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout(const QUrl&url)
@@ -57,9 +57,15 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
    header << tr("Action");
    header << tr("Size");

+    int timestampColumnExtra = 0;
+#ifdef Q_OS_WIN
+    timestampColumnExtra = 20; // font metrics are broken on Windows, see #4721
+#endif
+
    _ui->_treeWidget->setHeaderLabels( header );
    int timestampColumnWidth =
-        _ui->_treeWidget->fontMetrics().width(timeString(QDateTime::currentDateTime()));
+        _ui->_treeWidget->fontMetrics().width(timeString(QDateTime::currentDateTime()))
+        + timestampColumnExtra;
    _ui->_treeWidget->setColumnWidth(0, timestampColumnWidth);
    _ui->_treeWidget->setColumnWidth(1, 180);
    _ui->_treeWidget->setColumnCount(5);
@@ -84,7 +90,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
    _issueItemView->setHeaderLabels( header );
    timestampColumnWidth =
            ActivityItemDelegate::rowHeight() // icon
-            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()));
+            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()))
+            + timestampColumnExtra;
    _issueItemView->setColumnWidth(0, timestampColumnWidth);
    _issueItemView->setColumnWidth(1, 180);
    _issueItemView->setColumnCount(4);
@@ -212,7 +219,7 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo

 void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo& progress )
 {
-    if( !progress.hasStarted() ) {
+    if( !progress.isUpdatingEstimates() ) {
        // The sync is restarting, clean the old items
        cleanItems(folder);
    } else if (progress.completedFiles() >= progress.totalFiles()) {
@@ -31,7 +31,7 @@ class SyncResult;
 namespace Ui {
  class ProtocolWidget;
 }
-class oCApplication;
+class Application;

 /**
 * @brief The ProtocolWidget class
@@ -33,7 +33,7 @@ namespace Ui {
 class SettingsDialog;
 }
 class AccountSettings;
-class oCApplication;
+class Application;
 class FolderMan;
 class ownCloudGui;
 class ActivitySettings;
@@ -56,6 +56,13 @@
 // The second number should be changed when there are new features.
 #define MIRALL_SOCKET_API_VERSION "1.0"

+static inline QString removeTrailingSlash(QString path)
+{
+    Q_ASSERT(path.endsWith(QLatin1Char('/')));
+    path.truncate(path.length()-1);
+    return path;
+}
+
 namespace OCC {

 #define DEBUG qDebug() << "SocketApi: "
@@ -142,7 +149,7 @@ void SocketApi::slotNewConnection()

    foreach( Folder *f, FolderMan::instance()->map() ) {
        if (f->canSync()) {
-            QString message = buildRegisterPathMessage(f->path());
+            QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
            sendMessage(socket, message);            
        }
    }
@@ -189,7 +196,7 @@ void SocketApi::slotRegisterPath( const QString& alias )

    Folder *f = FolderMan::instance()->folder(alias);
    if (f) {
-        QString message = buildRegisterPathMessage(f->path());
+        QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
        foreach(QIODevice *socket, _listeners) {
            sendMessage(socket, message);
        }
@@ -205,7 +212,7 @@ void SocketApi::slotUnregisterPath( const QString& alias )

    Folder *f = FolderMan::instance()->folder(alias);
    if (f)
-        broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path(), QString::null, true );
+        broadcastMessage(QLatin1String("UNREGISTER_PATH"), removeTrailingSlash(f->path()), QString::null, true );

    _registeredAliases.remove(alias);
 }
@@ -225,10 +232,11 @@ void SocketApi::slotUpdateFolderView(Folder *f)
                f->syncResult().status() == SyncResult::Error   ||
                f->syncResult().status() == SyncResult::SetupError ) {

-            broadcastMessage(QLatin1String("STATUS"), f->path() ,
+            QString rootPath = removeTrailingSlash(f->path());
+            broadcastMessage(QLatin1String("STATUS"), rootPath,
                             f->syncEngine().syncFileStatusTracker().fileStatus("").toSocketAPIString());

-            broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
+            broadcastMessage(QLatin1String("UPDATE_VIEW"), rootPath);
        } else {
            qDebug() << "Not sending UPDATE_VIEW for" << f->alias() << "because status() is" << f->syncResult().status();
        }
@@ -302,8 +310,12 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice*
        // this can happen in offline mode e.g.: nothing to worry about
        statusString = QLatin1String("NOP");
    } else {
-        const QString file = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
-        SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(file);
+        QString relativePath = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
+        if( relativePath.endsWith(QLatin1Char('/')) ) {
+            relativePath.truncate(relativePath.length()-1);
+            qWarning() << "Removed trailing slash for directory: " << relativePath << "Status pushes won't have one.";
+        }
+        SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(relativePath);

        statusString = fileStatus.toSocketAPIString();
    }
@@ -12,15 +12,9 @@
 * for more details.
 */

-#ifdef HAVE_LIBSNORE
-#include <libsnore/application.h>
-#include <libsnore/notification/icon.h>
-#endif
-
 #include "systray.h"
 #include "theme.h"
 #include <QDebug>
-#include <QPointer>

 #ifdef USE_FDO_NOTIFICATIONS
 #include <QDBusConnection>
@@ -34,54 +28,8 @@

 namespace OCC {

-Systray::Systray( )
+void Systray::showMessage(const QString & title, const QString & message, MessageIcon icon, int millisecondsTimeoutHint)
 {
-#ifdef HAVE_LIBSNORE
-    Snore::SnoreCore &snore = Snore::SnoreCore::instance();
-    snore.loadPlugins( Snore::SnorePlugin::Backend | Snore::SnorePlugin::SecondaryBackend );
-    snore.setDefaultSettingsValue("Silent", true, Snore::LocalSetting );
-
-    _application = Snore::Application( Theme::instance()->appName(), Theme::instance()->applicationIcon() );
-    _application.hints().setValue( "use-markup", true );
-    _application.hints().setValue( "windows-app-id",  Theme::instance()->appName() );
-    _application.hints().setValue( "desktop-entry",  Theme::instance()->appNameGUI() );
-    _application.hints().setValue( "tray-icon",  qVariantFromValue(QPointer<QSystemTrayIcon>(this)));
-
-    // register the Alerts.
-    Snore::Alert alert( Theme::instance()->appNameGUI(), QIcon() );
-    _alerts.insert( QSystemTrayIcon::NoIcon, alert);
-    _application.addAlert(alert);
-    Snore::Alert alert2( Theme::instance()->appNameGUI(), Theme::instance()->syncStateIcon(SyncResult::Success, false ));
-    _alerts.insert( QSystemTrayIcon::Information, alert2);
-    _application.addAlert(alert2);
-    Snore::Alert alert3( Theme::instance()->appNameGUI(), Theme::instance()->syncStateIcon(SyncResult::Problem, false ));
-    _alerts.insert( QSystemTrayIcon::Warning, alert3);
-    _application.addAlert(alert3);
-    Snore::Alert alert4( Theme::instance()->appNameGUI(), Theme::instance()->syncStateIcon(SyncResult::Error, false ));
-    _alerts.insert( QSystemTrayIcon::Critical, alert4);
-    _application.addAlert(alert4);
-
-    snore.registerApplication( _application );
-    snore.setDefaultApplication( _application );
-
-    // connect( &snore, SIGNAL( actionInvoked( Snore::Notification ) ), this, SLOT( slotActionInvoked( Snore::Notification ) ) );
-#endif
-}
-
-void Systray::showMessage(const QString & title, const QString & message, MessageIcon icon,
-                          int millisecondsTimeoutHint)
-{
-#ifdef HAVE_LIBSNORE
-    Snore::Alert a = _alerts[NoIcon];
-    if( _alerts.contains(icon) ) {
-        a = _alerts[icon];
-    }
-
-    Snore::Notification n( _application , a, title, message, a.icon() );
-    Snore::SnoreCore::instance().broadcastNotification( n );
-
-    return;
-#endif

 #ifdef USE_FDO_NOTIFICATIONS
    if(QDBusInterface(NOTIFICATIONS_SERVICE, NOTIFICATIONS_PATH, NOTIFICATIONS_IFACE).isValid()) {
@@ -15,13 +15,8 @@
 #ifndef SYSTRAY_H
 #define SYSTRAY_H

-#include "logger.h"
 #include <QSystemTrayIcon>

-#ifdef HAVE_LIBSNORE
-#include <libsnore/snore.h>
-#endif
-
 class QIcon;

 namespace OCC {
@@ -39,17 +34,8 @@ class Systray : public QSystemTrayIcon
 {
    Q_OBJECT
 public:
-    explicit Systray();
-
-    void showMessage(const QString & title, const QString & message, MessageIcon icon = Information,
-                     int millisecondsTimeoutHint = 10000);
+    void showMessage(const QString & title, const QString & message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000);
    void setToolTip(const QString &tip);
-
-private:
-#ifdef HAVE_LIBSNORE
-    Snore::Application _application;
-    QHash<QSystemTrayIcon::MessageIcon, Snore::Alert> _alerts;
-#endif
 };

 } // namespace OCC
@@ -40,7 +40,6 @@ Account::Account(QObject *parent)
    , _capabilities(QVariantMap())
    , _am(0)
    , _credentials(0)
-    , _treatSslErrorsAsFailure(false)
    , _davPath( Theme::instance()->webDavPath() )
    , _wasMigrated(false)
 {
@@ -329,9 +328,9 @@ void Account::addApprovedCerts(const QList<QSslCertificate> certs)
    _approvedCerts += certs;
 }

-void Account::resetSslCertErrorState()
+void Account::resetRejectedCertificates()
 {
-    _treatSslErrorsAsFailure = false;
+    _rejectedCertificates.clear();
 }

 void Account::setSslErrorHandler(AbstractSslErrorHandler *handler)
@@ -412,8 +411,15 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
                     << error.errorString() << "("<< error.error() << ")" << "\n";
    }

-    if( _treatSslErrorsAsFailure ) {
-        // User decided once not to trust. Honor this decision.
+    bool allPreviouslyRejected = true;
+    foreach (const QSslError &error, errors) {
+        if (!_rejectedCertificates.contains(error.certificate())) {
+            allPreviouslyRejected = false;
+        }
+    }
+
+    // If all certs have previously been rejected by the user, don't ask again.
+    if( allPreviouslyRejected ) {
        qDebug() << out << "Certs not trusted by user decision, returning.";
        return;
    }
@@ -436,7 +442,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
        // certificate changes.
        reply->ignoreSslErrors(errors);
    } else {
-        _treatSslErrorsAsFailure = true;
+        // Mark all involved certificates as rejected, so we don't ask the user again.
+        foreach (const QSslError &error, errors) {
+            if (!_rejectedCertificates.contains(error.certificate())) {
+                _rejectedCertificates.append(error.certificate());
+            }
+        }
        // if during normal operation, a new certificate was MITM'ed, and the user does not
        // ACK it, the running request must be aborted and the QNAM must be reset, to not
        // treat the new cert as granted. See bug #3283
@@ -133,7 +133,7 @@ public:
    // Usually when a user explicitly rejects a certificate we don't
    // ask again. After this call, a dialog will again be shown when
    // the next unknown certificate is encountered.
-    void resetSslCertErrorState();
+    void resetRejectedCertificates();

    // pluggable handler
    void setSslErrorHandler(AbstractSslErrorHandler *handler);
@@ -216,7 +216,10 @@ private:
    QuotaInfo *_quotaInfo;
    QNetworkAccessManager *_am;
    AbstractCredentials* _credentials;
-    bool _treatSslErrorsAsFailure;
+
+    /// Certificates that were explicitly rejected by the user
+    QList<QSslCertificate> _rejectedCertificates;
+
    static QString _configFileName;
    QByteArray _pemCertificate; 
    QString _pemPrivateKey;  
@@ -74,14 +74,14 @@ Logger::~Logger() {
 }


-void Logger::postGuiLog(const QString &title, const QString &message, NotificationType type )
+void Logger::postGuiLog(const QString &title, const QString &message)
 {
-    emit guiLog(title, message, type);
+    emit guiLog(title, message);
 }

-void Logger::postOptionalGuiLog(const QString &title, const QString &message, NotificationType type )
+void Logger::postOptionalGuiLog(const QString &title, const QString &message)
 {
-    emit optionalGuiLog(title, message, type);
+    emit optionalGuiLog(title, message);
 }

 void Logger::postGuiMessage(const QString &title, const QString &message)
@@ -45,14 +45,6 @@ class OWNCLOUDSYNC_EXPORT Logger : public QObject
 {
  Q_OBJECT
 public:
-    enum NotificationType {
-        NoIcon = 0,
-        Information,
-        SoftError,
-        Error,
-        Critical
-    };
-

  bool isNoop() const;
  void log(Log log);
@@ -65,8 +57,8 @@ public:

  static Logger* instance();

-  void postGuiLog(const QString& title, const QString& message, NotificationType type = Information);
-  void postOptionalGuiLog(const QString& title, const QString& message, NotificationType type = Information);
+  void postGuiLog(const QString& title, const QString& message);
+  void postOptionalGuiLog(const QString& title, const QString& message);
  void postGuiMessage(const QString& title, const QString& message);

  void setLogFile( const QString & name );
@@ -76,9 +68,9 @@ public:

 signals:
  void newLog(const QString&);
-  void guiLog(const QString&, const QString&, Logger::NotificationType type);
+  void guiLog(const QString&, const QString&);
  void guiMessage(const QString&, const QString&);
-  void optionalGuiLog(const QString&, const QString&, Logger::NotificationType type);
+  void optionalGuiLog(const QString&, const QString&);

 public slots:
  void enterNextLogFile();
@@ -297,7 +297,12 @@ public:

    QAtomicInt _abortRequested; // boolean set by the main thread to abort.

-    /* The list of currently active jobs */
+    /** The list of currently active jobs.
+        This list contains the jobs that are currently using ressources and is used purely to
+        know how many jobs there is currently running for the scheduler.
+        Jobs add themself to the list when they do an assynchronous operation.
+        Jobs can be several time on the list (example, when several chunks are uploaded in parallel)
+     */
    QList<PropagateItemJob*> _activeJobList;

    /** We detected that another sync is required after this one */
@@ -127,27 +127,65 @@ void ProgressDispatcher::setProgressInfo(const QString& folder, const ProgressIn
    emit progressInfo( folder, progress );
 }

-void ProgressInfo::start()
+ProgressInfo::ProgressInfo()
 {
    connect(&_updateEstimatesTimer, SIGNAL(timeout()), SLOT(updateEstimates()));
+    reset();
+}
+
+void ProgressInfo::reset()
+{
+    _currentItems.clear();
+    _currentDiscoveredFolder.clear();
+    _sizeProgress = Progress();
+    _fileProgress = Progress();
+    _totalSizeOfCompletedJobs = 0;
+    _maxBytesPerSecond = 100000.0;
+    _maxFilesPerSecond = 2.0;
+    _updateEstimatesTimer.stop();
+}
+
+void ProgressInfo::startEstimateUpdates()
+{
    _updateEstimatesTimer.start(1000);
 }

-bool ProgressInfo::hasStarted() const
+bool ProgressInfo::isUpdatingEstimates() const
 {
    return _updateEstimatesTimer.isActive();
 }

+static bool shouldCountProgress(const SyncFileItem &item)
+{
+    const auto instruction = item._instruction;
+
+    // Don't worry about directories that won't have propagation
+    // jobs associated with them.
+    if (item._isDirectory
+            && (instruction == CSYNC_INSTRUCTION_NONE
+                || instruction == CSYNC_INSTRUCTION_SYNC
+                || instruction == CSYNC_INSTRUCTION_CONFLICT)) {
+        return false;
+    }
+
+    // Skip any ignored or error files, we do nothing with them.
+    if (instruction == CSYNC_INSTRUCTION_IGNORE
+            || instruction == CSYNC_INSTRUCTION_ERROR) {
+        return false;
+    }
+
+    return true;
+}
+
 void ProgressInfo::adjustTotalsForFile(const SyncFileItem &item)
 {
-    if (!item._isDirectory) {
-        _fileProgress._total++;
-        if (isSizeDependent(item)) {
-            _sizeProgress._total += item._size;
-        }
-    } else if (item._instruction != CSYNC_INSTRUCTION_NONE) {
-        // Added or removed directories certainly count.
-        _fileProgress._total++;
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
+    _fileProgress._total += item._affectedItems;
+    if (isSizeDependent(item)) {
+        _sizeProgress._total += item._size;
    }
 }

@@ -178,6 +216,10 @@ quint64 ProgressInfo::completedSize() const

 void ProgressInfo::setProgressComplete(const SyncFileItem &item)
 {
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
    _currentItems.remove(item._file);
    _fileProgress.setCompleted(_fileProgress._completed + item._affectedItems);
    if (ProgressInfo::isSizeDependent(item)) {
@@ -189,6 +231,10 @@ void ProgressInfo::setProgressComplete(const SyncFileItem &item)

 void ProgressInfo::setProgressItem(const SyncFileItem &item, quint64 completed)
 {
+    if (!shouldCountProgress(item)) {
+        return;
+    }
+
    _currentItems[item._file]._item = item;
    _currentItems[item._file]._progress._total = item._size;
    _currentItems[item._file]._progress.setCompleted(completed);
@@ -37,27 +37,27 @@ class OWNCLOUDSYNC_EXPORT ProgressInfo : public QObject
 {
    Q_OBJECT
 public:
-    ProgressInfo()
-        : _totalSizeOfCompletedJobs(0)
-        , _maxFilesPerSecond(2.0)
-        , _maxBytesPerSecond(100000.0)
-    {}
+    ProgressInfo();
+
+    /** Resets for a new sync run.
+     */
+    void reset();

    /**
     * Called when propagation starts.
     *
-     * hasStarted() will return true afterwards.
+     * isUpdatingEstimates() will return true afterwards.
     */
-    void start();
+    void startEstimateUpdates();

    /**
-     * Returns true when propagation has started (start() was called).
+     * Returns true when startEstimateUpdates() was called.
     *
     * This is used when the SyncEngine wants to indicate a new sync
     * is about to start via the transmissionProgress() signal. The
-     * first ProgressInfo will have hasStarted() == false.
+     * first ProgressInfo will have isUpdatingEstimates() == false.
     */
-    bool hasStarted() const;
+    bool isUpdatingEstimates() const;

    /**
     * Increase the file and size totals by the amount indicated in item.
@@ -654,7 +654,6 @@ static void preserveGroupOwnership(const QString& fileName, const QFileInfo& fi)
 }
 } // end namespace

-
 void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
 {
    const auto theContentChecksumType = contentChecksumType();
@@ -209,8 +209,6 @@ void PropagateUploadFileQNAM::slotComputeContentChecksum()
        return;
    }

-    _propagator->_activeJobList.removeOne(this);
-
    const QString filePath = _propagator->getFilePath(_item->_file);

    // remember the modtime before checksumming to be able to detect a file
@@ -274,6 +272,10 @@ void PropagateUploadFileQNAM::slotComputeTransmissionChecksum(const QByteArray&

 void PropagateUploadFileQNAM::slotStartUpload(const QByteArray& transmissionChecksumType, const QByteArray& transmissionChecksum)
 {
+    // Remove ourselfs from the list of active job, before any posible call to done()
+    // When we start chunks, we will add it again, once for every chunks.
+    _propagator->_activeJobList.removeOne(this);
+
    _transmissionChecksum = transmissionChecksum;
    _transmissionChecksumType = transmissionChecksumType;

@@ -398,7 +400,7 @@ qint64 UploadDevice::readData(char* data, qint64 maxlen) {
    if (isBandwidthLimited()) {
        maxlen = qMin(maxlen, _bandwidthQuota);
        if (maxlen <= 0) {  // no quota
-            qDebug() << "no quota";
+            //qDebug() << "no quota";
            return 0;
        }
        _bandwidthQuota -= maxlen;
@@ -544,8 +546,16 @@ void PropagateUploadFileQNAM::startNextChunk()
                _transmissionChecksumType, _transmissionChecksum);
    }

-    if (! device->prepareAndOpen(_propagator->getFilePath(_item->_file), chunkStart, currentChunkSize)) {
+    const QString fileName = _propagator->getFilePath(_item->_file);
+    if (! device->prepareAndOpen(fileName, chunkStart, currentChunkSize)) {
        qDebug() << "ERR: Could not prepare upload device: " << device->errorString();
+
+        // If the file is currently locked, we want to retry the sync
+        // when it becomes available again.
+        if (FileSystem::isFileLocked(fileName)) {
+            emit _propagator->seenLockedFile(fileName);
+        }
+
        // Soft error because this is likely caused by the user modifying his files while syncing
        abortWithError( SyncFileItem::SoftError, device->errorString() );
        delete device;
@@ -203,6 +203,12 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)

 }

+/**
+ * Check if the item is in the blacklist.
+ * If it should not be sync'ed because of the blacklist, update the item with the error instruction
+ * and proper error message, and return true.
+ * If the item is not in the blacklist, or the blacklist is stale, return false.
+ */
 bool SyncEngine::checkErrorBlacklisting( SyncFileItem &item )
 {
    if( !_journal ) {
@@ -234,6 +240,9 @@ bool SyncEngine::checkErrorBlacklisting( SyncFileItem &item )
        } else if( item._modtime != entry._lastTryModtime ) {
            qDebug() << item._file << " is blacklisted, but has changed mtime!";
            return false;
+        } else if( item._renameTarget != entry._renameTarget) {
+            qDebug() << item._file << " is blacklisted, but rename target changed from" << entry._renameTarget;
+            return false;
        }
    } else if( item._direction == SyncFileItem::Down ) {
        // download, check the etag.
@@ -539,10 +548,10 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
        bool directoryEtagUpdate = isDirectory && file->should_update_metadata;
        bool localMetadataUpdate = !remote && file->should_update_metadata;
        if (!directoryEtagUpdate) {
+            item->_isDirectory = isDirectory;
            if (localMetadataUpdate) {
                // Hack, we want a local metadata update to happen, but only if the
                // remote tree doesn't ask us to do some kind of propagation.
-                item->_isDirectory = isDirectory;
                _syncItemMap.insert(key, item);
            }
            emit syncItemDiscovered(*item);
@@ -571,7 +580,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
            // An upload of an existing file means that the file was left unchanged on the server
            // This counts as a NONE for detecting if all the files on the server were changed
            _hasNoneFiles = true;
-        } else if (!item->_isDirectory) {
+        } else if (!isDirectory) {
            if (std::difftime(file->modtime, file->other.modtime) < 0) {
                // We are going back on time
                _backInTimeFiles++;
@@ -673,6 +682,8 @@ void SyncEngine::startSync()
    _syncRunning = true;
    _anotherSyncNeeded = false;

+    _progressInfo->reset();
+
    if (!QDir(_localPath).exists()) {
        // No _tr, it should only occur in non-mirall
        emit csyncError("Unable to find local sync folder.");
@@ -909,7 +920,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
    emit aboutToPropagate(_syncedItems);
    // it's important to do this before ProgressInfo::start(), to announce start of new sync
    emit transmissionProgress(*_progressInfo);
-    _progressInfo->start();
+    _progressInfo->startEstimateUpdates();

    // post update phase script: allow to tweak stuff by a custom script in debug mode.
    if( !qgetenv("OWNCLOUD_POST_UPDATE_SCRIPT").isEmpty() ) {
@@ -1244,15 +1255,18 @@ void SyncEngine::checkForPermission()
                    }
                }

-#if 0 /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
-
-                if (!sourceOK && !destinationOK) {
+#ifdef OWNCLOUD_RESTORE_RENAME /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
+                if (!sourceOK && (!destinationOK || isRename)
+                        // (not for directory because that's more complicated with the contents that needs to be adjusted)
+                        && !(*it)->_isDirectory) {
                    // Both the source and the destination won't allow move.  Move back to the original
                    std::swap((*it)->_file, (*it)->_renameTarget);
                    (*it)->_direction = SyncFileItem::Down;
                    (*it)->_errorString = tr("Move not allowed, item restored");
                    (*it)->_isRestoration = true;
                    qDebug() << "checkForPermission: MOVING BACK" << (*it)->_file;
+                    // in case something does wrong, we will not do it next time
+                    _journal->avoidRenamesOnNextSync((*it)->_file);
                } else
 #endif
                if (!sourceOK || !destinationOK) {
@@ -92,15 +92,13 @@ SyncFileItem SyncFileStatusTracker::rootSyncFileItem()
    return fakeRootItem;
 }

-SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& systemFileName)
+SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
 {
-    QString fileName = systemFileName.normalized(QString::NormalizationForm_C);
-    if( fileName.endsWith(QLatin1Char('/')) ) {
-        fileName.truncate(fileName.length()-1);
-        qDebug() << "Removed trailing slash: " << fileName;
-    }
+    // normalization is required for OS X to match file names properly
+    QString normalizedRelativePath = relativePath.normalized(QString::NormalizationForm_C);
+    Q_ASSERT(!normalizedRelativePath.endsWith(QLatin1Char('/')));

-    if( fileName.isEmpty() ) {
+    if (normalizedRelativePath.isEmpty()) {
        // This is the root sync folder, it doesn't have an entry in the database and won't be walked by csync, so create one manually.
        return syncFileItemStatus(rootSyncFileItem());
    }
@@ -111,22 +109,22 @@ SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& systemFileName)
    // update the exclude list at runtime and doing it statically here removes
    // our ability to notify changes through the fileStatusChanged signal,
    // it's an acceptable compromize to treat all exclude types the same.
-    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + fileName,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + normalizedRelativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

-    if ( _dirtyPaths.contains(fileName) )
+    if ( _dirtyPaths.contains(normalizedRelativePath) )
        return SyncFileStatus::StatusSync;

-    SyncFileItem* item = _syncEngine->findSyncItem(fileName);
+    SyncFileItem* item = _syncEngine->findSyncItem(normalizedRelativePath);
    if (item) {
        return syncFileItemStatus(*item);
    }

    // If we're not currently syncing that file, look it up in the database to know if it's shared
-    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(fileName);
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(normalizedRelativePath);
    if (rec.isValid()) {
        return syncFileItemStatus(rec.toSyncFileItem());
    }
@@ -158,7 +156,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
        } else if (showWarningInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
        }
-        emit fileStatusChanged(getSystemDestination(*item), syncFileItemStatus(*item));
+        emit fileStatusChanged(getSystemDestination(item->destination()), syncFileItemStatus(*item));
    }

    // Make sure to push any status that might have been resolved indirectly since the last sync
@@ -170,7 +168,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
        SyncFileStatus::SyncFileStatusTag severity = it->second;
        if (severity == SyncFileStatus::StatusError)
            invalidateParentPaths(path);
-        emit fileStatusChanged(_syncEngine->localPath() + path, fileStatus(path));
+        emit fileStatusChanged(getSystemDestination(path), fileStatus(path));
    }
 }

@@ -184,11 +182,10 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
    } else if (showWarningInSocketApi(item)) {
        _syncProblems[item._file] = SyncFileStatus::StatusWarning;
    } else {
-        // There is currently no situation where an error status set during discovery/update is fixed by propagation.
-        Q_ASSERT(_syncProblems.find(item._file) == _syncProblems.end());
+        _syncProblems.erase(item._file);
    }

-    emit fileStatusChanged(getSystemDestination(item), syncFileItemStatus(item));
+    emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));
 }

 void SyncFileStatusTracker::slotSyncEngineRunningChanged()
@@ -236,20 +233,19 @@ void SyncFileStatusTracker::invalidateParentPaths(const QString& path)
    QStringList splitPath = path.split('/', QString::SkipEmptyParts);
    for (int i = 0; i < splitPath.size(); ++i) {
        QString parentPath = QStringList(splitPath.mid(0, i)).join(QLatin1String("/"));
-        emit fileStatusChanged(_syncEngine->localPath() + parentPath, fileStatus(parentPath));
+        emit fileStatusChanged(getSystemDestination(parentPath), fileStatus(parentPath));
    }
 }

-QString SyncFileStatusTracker::getSystemDestination(const SyncFileItem& item)
+QString SyncFileStatusTracker::getSystemDestination(const QString& relativePath)
 {
-    QString systemFileName = _syncEngine->localPath() + item.destination();
-    // the trailing slash for directories must be appended as the filenames coming in
-    // from the plugins have that too. Otherwise the matching entry item is not found
-    // in the plugin.
-    if( item._type == SyncFileItem::Type::Directory ) {
-        systemFileName += QLatin1Char('/');
+    QString systemPath = _syncEngine->localPath() + relativePath;
+    // SyncEngine::localPath() has a trailing slash, make sure to remove it if the
+    // destination is empty.
+    if( systemPath.endsWith(QLatin1Char('/')) ) {
+        systemPath.truncate(systemPath.length()-1);
    }
-    return systemFileName;
+    return systemPath;
 }

 }
@@ -35,7 +35,7 @@ class OWNCLOUDSYNC_EXPORT SyncFileStatusTracker : public QObject
    Q_OBJECT
 public:
    explicit SyncFileStatusTracker(SyncEngine* syncEngine);
-    SyncFileStatus fileStatus(const QString& systemFileName);
+    SyncFileStatus fileStatus(const QString& relativePath);

 public slots:
    void slotPathTouched(const QString& fileName);
@@ -54,7 +54,7 @@ private:
    SyncFileItem rootSyncFileItem();

    void invalidateParentPaths(const QString& path);
-    QString getSystemDestination(const SyncFileItem& syncEnginePath);
+    QString getSystemDestination(const QString& relativePath);

    SyncEngine* _syncEngine;

@@ -409,7 +409,7 @@ bool SyncJournalDb::checkConnect()
    _deleteFileRecordRecursively.reset(new SqlQuery(_db));
    _deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')");

-    QString sql( "SELECT lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration "
+    QString sql( "SELECT lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration, renameTarget "
                 "FROM blacklist WHERE path=?1");
    if( Utility::fsCasePreserving() ) {
        // if the file system is case preserving we have to check the blacklist
@@ -421,8 +421,8 @@ bool SyncJournalDb::checkConnect()

    _setErrorBlacklistQuery.reset(new SqlQuery(_db));
    _setErrorBlacklistQuery->prepare("INSERT OR REPLACE INTO blacklist "
-                                "(path, lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration) "
-                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7)");
+                                "(path, lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration, renameTarget) "
+                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)");

    _getSelectiveSyncListQuery.reset(new SqlQuery(_db));
    _getSelectiveSyncListQuery->prepare("SELECT path FROM selectivesync WHERE type=?1");
@@ -612,6 +612,15 @@ bool SyncJournalDb::updateErrorBlacklistTableStructure()
        }
        commitInternal("update database structure: add lastTryTime, ignoreDuration cols");
    }
+    if( columns.indexOf(QLatin1String("renameTarget")) == -1 ) {
+        SqlQuery query(_db);
+        query.prepare("ALTER TABLE blacklist ADD COLUMN renameTarget VARCHAR(4096);");
+        if( !query.exec() ) {
+            sqlFail("updateBlacklistTableStructure: Add renameTarget", query);
+            re = false;
+        }
+        commitInternal("update database structure: add lastTryTime, ignoreDuration cols");
+    }

    SqlQuery query(_db);
    query.prepare("CREATE INDEX IF NOT EXISTS blacklist_index ON blacklist(path collate nocase);");
@@ -1224,6 +1233,7 @@ SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry( const QStrin
                entry._errorString    = _getErrorBlacklistQuery->stringValue(3);
                entry._lastTryTime    = _getErrorBlacklistQuery->int64Value(4);
                entry._ignoreDuration = _getErrorBlacklistQuery->int64Value(5);
+                entry._renameTarget   = _getErrorBlacklistQuery->stringValue(6);
                entry._file           = file;
            }
            _getErrorBlacklistQuery->reset_and_clear_bindings();
@@ -1335,13 +1345,14 @@ void SyncJournalDb::updateErrorBlacklistEntry( const SyncJournalErrorBlacklistRe
    _setErrorBlacklistQuery->bindValue(5, item._errorString);
    _setErrorBlacklistQuery->bindValue(6, QString::number(item._lastTryTime));
    _setErrorBlacklistQuery->bindValue(7, QString::number(item._ignoreDuration));
+    _setErrorBlacklistQuery->bindValue(8, item._renameTarget);
    if( !_setErrorBlacklistQuery->exec() ) {
        QString bug = _setErrorBlacklistQuery->error();
        qDebug() << "SQL exec blacklistitem insert or replace failed: "<< bug;
    }
    qDebug() << "set blacklist entry for " << item._file << item._retryCount
             << item._errorString << item._lastTryTime << item._ignoreDuration
-             << item._lastTryModtime << item._lastTryEtag;
+             << item._lastTryModtime << item._lastTryEtag << item._renameTarget ;
    _setErrorBlacklistQuery->reset_and_clear_bindings();

 }
@@ -151,6 +151,7 @@ SyncJournalErrorBlacklistRecord SyncJournalErrorBlacklistRecord::update(
    // The factor of 5 feels natural: 25s, 2 min, 10 min, ~1h, ~5h, ~24h
    entry._ignoreDuration = old._ignoreDuration * 5;
    entry._file = item._file;
+    entry._renameTarget = item._renameTarget;

    if( item._httpErrorCode == 403 ) {
        qDebug() << "Probably firewall error: " << item._httpErrorCode << ", blacklisting up to 1h only";
@@ -89,6 +89,7 @@ public:
    time_t     _ignoreDuration;

    QString    _file;
+    QString    _renameTarget;

    bool isValid() const;

@@ -306,17 +306,22 @@ namespace {
        QString description(quint64 value) const
        {
            return QCoreApplication::translate(
-                    "Utiliy", name, 0, QCoreApplication::UnicodeUTF8,
+                    "Utility", name, 0, QCoreApplication::UnicodeUTF8,
                    value);
        }
    };
+// QTBUG-3945 and issue #4855: QT_TRANSLATE_NOOP does not work with plural form because lupdate
+// limitation unless we fake more arguments
+// (it must be in the form ("context", "source", "comment", n)
+#undef QT_TRANSLATE_NOOP
+#define QT_TRANSLATE_NOOP(ctx, str, ...) str
    Q_DECL_CONSTEXPR Period periods[] = {
-        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n year(s)" , 0, _) , 365*24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n month(s)", 0, _) , 30*24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n day(s)", 0, _) , 24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n hour(s)", 0, _) , 3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n minute(s)", 0, _) , 60*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%n second(s)", 0, _ ), 1000LL },
        { 0, 0 }
    };
 } // anonymous namespace
@@ -11,7 +11,7 @@ macro(owncloud_add_test test_class additional_cpp)
    string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)

    add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)
+    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network)

    target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
        updater
@@ -150,5 +150,10 @@ using namespace OCC;
    }
 };

-QTEST_MAIN(TestChecksumValidator)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestChecksumValidator)
+#else
+    QTEST_GUILESS_MAIN(TestChecksumValidator)
+#endif
+
 #include "testchecksumvalidator.moc"
@@ -100,5 +100,5 @@ private slots:

 };

-QTEST_MAIN(TestConcatUrl)
+QTEST_APPLESS_MAIN(TestConcatUrl)
 #include "testconcaturl.moc"
@@ -85,5 +85,5 @@ private slots:

 };

-QTEST_MAIN(TestCSyncSqlite)
+QTEST_APPLESS_MAIN(TestCSyncSqlite)
 #include "testcsyncsqlite.moc"
@@ -26,24 +26,25 @@ private slots:
        bool excludeHidden = true;
        bool keepHidden = false;

-        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/b~", "b~", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
+        bool x = excluded.isExcluded("/a/b", "/a", keepHidden);
+        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/b~", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));

        QString path(BIN_PATH);
        path.append("/sync-exclude.lst");
        excluded.addExcludeFilePath(path);
        excluded.reloadExcludes();

-        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/b~", "b~", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.Trashes", ".Trashes", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "foo_conflict-bar", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
+        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/b~", "/a", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.Trashes", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
    }
 };

-QTEST_MAIN(TestExcludedFiles)
+QTEST_APPLESS_MAIN(TestExcludedFiles)
 #include "testexcludedfiles.moc"
@@ -87,5 +87,5 @@ private slots:

 };

-QTEST_MAIN(TestFileSystem)
+QTEST_APPLESS_MAIN(TestFileSystem)
 #include "testfilesystem.moc"
@@ -41,5 +41,5 @@ private slots:

 };

-QTEST_MAIN(TestFolder)
+QTEST_APPLESS_MAIN(TestFolder)
 #include "testfolder.moc"
@@ -118,5 +118,5 @@ private slots:
    }
 };

-QTEST_MAIN(TestFolderMan)
+QTEST_APPLESS_MAIN(TestFolderMan)
 #include "testfolderman.moc"
@@ -170,5 +170,10 @@ private slots:
    }
 };

-QTEST_MAIN(TestFolderWatcher)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestFolderWatcher)
+#else
+    QTEST_GUILESS_MAIN(TestFolderWatcher)
+#endif
+
 #include "testfolderwatcher.moc"
@@ -69,5 +69,5 @@ private slots:
    }
 };

-QTEST_MAIN(TestInotifyWatcher)
+QTEST_APPLESS_MAIN(TestInotifyWatcher)
 #include "testinotifywatcher.moc"
@@ -72,5 +72,5 @@ private slots:
    }
 };

-QTEST_MAIN(TestNetrcParser)
+QTEST_APPLESS_MAIN(TestNetrcParser)
 #include "testnetrcparser.moc"
@@ -78,5 +78,5 @@ private slots:
    }
 };

-QTEST_MAIN(TestOwncloudPropagator)
+QTEST_APPLESS_MAIN(TestOwncloudPropagator)
 #include "testowncloudpropagator.moc"
@@ -149,5 +149,5 @@ private:
    SqlDatabase _db;
 };

-QTEST_MAIN(TestOwnSql)
+QTEST_APPLESS_MAIN(TestOwnSql)
 #include "testownsql.moc"
@@ -65,5 +65,5 @@ private slots:
    }
 };

-QTEST_MAIN(TestSyncFileItem)
+QTEST_APPLESS_MAIN(TestSyncFileItem)
 #include "testsyncfileitem.moc"
@@ -171,5 +171,5 @@ private:
    SyncJournalDb _db;
 };

-QTEST_MAIN(TestSyncJournalDB)
+QTEST_APPLESS_MAIN(TestSyncJournalDB)
 #include "testsyncjournaldb.moc"
@@ -30,5 +30,5 @@ private slots:

 };

-QTEST_MAIN(TestUpdater)
+QTEST_APPLESS_MAIN(TestUpdater)
 #include "testupdater.moc"
@@ -121,11 +121,13 @@ private slots:
                // Current requires an X-Server
                return;
            }
-            QString ver = versionOfInstalledBinary(BIN_PATH);
+            // pass the binary name owncloud to the next call. This brakes branding,
+            // but branding is not supposed to work with this.
+            QString ver = versionOfInstalledBinary(BIN_PATH+QLatin1String("/owncloud"));
 	    qDebug() << "Version of installed ownCloud Binary: " << ver;
 	    QVERIFY( !ver.isEmpty());

-	    QRegExp rx( "ownCloud version \\d+\\.\\d+\\.\\d+.+" );
+	    QRegExp rx( "ownCloud version \\d+\\.\\d+\\.\\d+.*" );
            QVERIFY( rx.exactMatch(ver));
 	} else {
 	    QVERIFY( versionOfInstalledBinary().isEmpty());
@@ -134,36 +136,29 @@ private slots:

    void testTimeAgo()
    {
-        // Both times in local time
+        // Both times in same timezone
        QDateTime d1 = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
        QDateTime d2 = QDateTime::fromString("2015-01-23T09:20:30+01:00", Qt::ISODate);
        QString s = timeAgoInWords(d2, d1);
        QCOMPARE(s, QLatin1String("1 day(s) ago"));

-        //
+        // Different timezones
        QDateTime earlyTS = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
-        earlyTS.setTimeSpec(Qt::UTC);
-        QDateTime laterTS = earlyTS.toOffsetFromUtc(3600);
-        laterTS.setTimeSpec(Qt::UTC);
+        QDateTime laterTS = QDateTime::fromString("2015-01-24T09:20:30-01:00", Qt::ISODate);
        s = timeAgoInWords(earlyTS, laterTS);
-        QCOMPARE(s, QLatin1String("1 hour(s) ago"));
+        QCOMPARE(s, QLatin1String("2 hour(s) ago"));

+        // 'Now' in whatever timezone
        earlyTS = QDateTime::currentDateTime();
-
-        laterTS.setTimeSpec(Qt::LocalTime);
-        laterTS.setTimeZone( QTimeZone("Pacific/Easter") );
        laterTS = earlyTS;
-
        s = timeAgoInWords(earlyTS, laterTS );
        QCOMPARE(s, QLatin1String("now"));

        earlyTS = earlyTS.addSecs(-6);
        s = timeAgoInWords(earlyTS, laterTS );
        QCOMPARE(s, QLatin1String("Less than a minute ago"));
-
-
    }
 };

-QTEST_MAIN(TestUtility)
+QTEST_APPLESS_MAIN(TestUtility)
 #include "testutility.moc"
@@ -441,5 +441,10 @@ private slots:

 };

-QTEST_MAIN(TestXmlParse)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestXmlParse)
+#else
+    QTEST_GUILESS_MAIN(TestXmlParse)
+#endif
+
 #include "testxmlparse.moc"
@@ -997,12 +997,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Introduïu la ruta del directori local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleccioneu la carpeta font</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crea una carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduïu el nom de la carpeta nova que es crearà a sota &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La carpeta s&apos;ha creat correctament a %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentificació fallida en accedir %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>No s&apos;ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Ha fallat en llistar una carpeta. Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolliu-ho per sincronitzar el compte sencer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Ja s&apos;està sincronitzant aquest directori.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ja esteu sincronitzant &lt;i&gt;%1&lt;/i&gt;, que és una carpeta dins de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Ja esteu sincronitzant tots els vostres fitxers. Sincronitzar una altra carpeta &lt;b&gt;no&lt;/b&gt; està permes. Si voleu sincronitzar múltiples carpetes, elimineu la configuració de sincronització de la carpeta arrel.</translation>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Trieu què sincronitzar: podeu seleccionar opcionalment quines subcarpetes remotes no voleu sincronitzar.</translation>
    </message>
@@ -1952,17 +1952,17 @@ No és aconsellada usar-la.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>El fitxer ha canviat des de que es va descobrir</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -2096,48 +2096,48 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fitxer eliminat</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>El fitxer local ha canviat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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>El fitxer s&apos;ha editat localment però és part d&apos;una compartició només de lectura. S&apos;ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>El fitxer local s&apos;ha eliminat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -2180,17 +2180,17 @@ No és aconsellada usar-la.</translation>
        <translation>Mida</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia la llista d&apos;activitats al porta-retalls.</translation>
    </message>
@@ -2541,17 +2541,17 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticat</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Es requereix nova acreditació</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>La vostra sessió ha vençut. Heu d&apos;acreditar-vos de nou per continuar usant el client.</translation>
    </message>
@@ -2559,7 +2559,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Comparteix amb %1</translation>
@@ -2853,23 +2853,23 @@ No és aconsellada usar-la.</translation>
        <translation>Error en llegir la carpeta.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2889,7 +2889,7 @@ No és aconsellada usar-la.</translation>
        <translation>Aturat per l&apos;usuari</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>El nom del fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
    </message>
@@ -2929,109 +2929,109 @@ No és aconsellada usar-la.</translation>
        <translation>S&apos;ha produït l&apos;error intern número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;element no s&apos;ha sincronitzat degut a errors previs: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>La sincronització d&apos;enllaços simbòlics no està implementada.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fitxer està a la llista d&apos;ignorats.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>El nom de fitxer és massa llarg.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>La codificació del nom de fitxer no és vàlida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caràcters no vàlids. Reanomeneu &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No es pot inicialitzar un periòdic de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>No es pot obrir el diari de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>S&apos;ignora degut al filtre a «Trieu què sincronitzar»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No es permet l&apos;eliminació, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Fitxers locals i carpeta compartida esborrats.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>No es permet moure&apos;l, l&apos;element es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No es permet moure perquè %1 només és de lectura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>el destí</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>l&apos;origen</translation>
    </message>
@@ -3505,37 +3505,37 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>fa %n dia</numerusform><numerusform>fa %n dies</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>fa %n hora</numerusform><numerusform>fa %n hores</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>ara</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Fa menys d&apos;un minut</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>fa %n minut</numerusform><numerusform>fa %n minuts</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Fa una estona</translation>
    </message>
@@ -3562,38 +3562,38 @@ No és aconsellada usar-la.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln any/s</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mes/os</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dia/es</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora/es</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minut/s</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segon/s</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -17,7 +17,7 @@
    <message>
        <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/>
        <source>Pick a local folder on your computer to sync</source>
-        <translation>Zvolte místní složku na svém počítači k synchronizaci</translation>
+        <translation>Zvolte místní adresář na svém počítači k synchronizaci</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/>
@@ -35,7 +35,7 @@
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/>
        <source>Select a remote destination folder</source>
-        <translation>Zvolte vzdálenou cílovou složku</translation>
+        <translation>Zvolte vzdálený cílový adresář</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/>
@@ -50,7 +50,7 @@
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/>
        <source>Folders</source>
-        <translation>Složky</translation>
+        <translation>Adresáře</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/>
@@ -101,7 +101,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="146"/>
        <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é složky 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>
+        <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/accountsettings.ui" line="193"/>
@@ -542,7 +542,7 @@
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="128"/>
        <source>Please update to the latest server and restart the client.</source>
-        <translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
+        <translation>Aktualizujte prosím na poslední verzi serveru a restartujte klienta.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="148"/>
@@ -581,7 +581,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
-        <translation>Místní složka %1 neexistuje.</translation>
+        <translation>Místní adresář %1 neexistuje.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="138"/>
@@ -695,8 +695,8 @@ Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</tran
        <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>Tato synchronizace by smazala všechny soubory ve složce &apos;%1&apos;.
-Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím, že byly všechny soubory ručně odstraněny.
+        <translation>Tato synchronizace by smazala všechny soubory v adresáři &apos;%1&apos;.
+Toto může být způsobeno změnou v nastavení synchronizace adresáře nebo tím, že byly všechny soubory ručně odstraněny.
 Opravdu chcete provést tuto akci?</translation>
    </message>
    <message>
@@ -744,7 +744,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
-        <translation>Nelze obnovit stav složky</translation>
+        <translation>Nelze obnovit stav adresáře</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="266"/>
@@ -824,7 +824,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
-        <translation>Nemáte oprávnění pro zápis do zvolené složky!</translation>
+        <translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1208"/>
@@ -839,17 +839,17 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains 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 již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte, prosím, jiný!</translation>
+        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte prosím jiný!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <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 složce použité pro synchronizaci. Vyberte, prosím, jiný!</translation>
+        <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="1233"/>
        <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>
+        <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>
 </context>
 <context>
@@ -1001,12 +1001,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Přidat synchronizaci adresáře</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Přidat synchronizační připojení</translation>
    </message>
@@ -1016,78 +1016,78 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="65"/>
        <source>Click to select a local folder to sync.</source>
-        <translation>Kliknutím zvolíte místní složku k synchronizaci.</translation>
+        <translation>Kliknutím zvolíte místní adresář k synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="69"/>
        <source>Enter the path to the local folder.</source>
-        <translation>Zadejte cestu k místní složce.</translation>
+        <translation>Zadejte cestu k místnímu adresáři.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
-        <translation>Zvolte zdrojovou složku</translation>
+        <translation>Zvolte zdrojový adresář</translation>
    </message>
 </context>
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
-        <translation>Vytvořit vzdálenou složku</translation>
+        <translation>Vytvořit vzdálený adresář</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Zadejte název nově vytvářené složky níže &apos;%1&apos;:</translation>
+        <translation>Zadejte název nově vytvářeného adresáře níže &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
-        <translation>Složka byla úspěšně vytvořena na %1.</translation>
+        <translation>Adresář byl úspěšně vytvořen na %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Ověření selhalo při připojení %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
-        <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně.</translation>
+        <translation>Na %1 selhalo vytvoření adresáře. Zkontrolujte to prosím ručně.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Chyba při vypsání adresáře. Chyba: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Zvolte toto k provedení synchronizace celého účtu</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
-        <translation>Tato složka je již synchronizována.</translation>
+        <translation>Tento adresář je již synchronizován.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
-        <translation>Již synchronizujete složku &lt;i&gt;%1&lt;/i&gt;, která je složce &lt;i&gt;%2&lt;/i&gt; nadřazená.</translation>
+        <translation>Již synchronizujete adresář &lt;i&gt;%1&lt;/i&gt;, který je adresáři &lt;i&gt;%2&lt;/i&gt; nadřazený.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
-        <translation>Již synchronizujete všechny své soubory. Synchronizování další složky &lt;b&gt;není&lt;/b&gt; podporováno. Pokud chcete synchronizovat více složek, odstraňte prosím synchronizaci aktuální kořenové složky.</translation>
+        <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="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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 podsložky, které si nepřejete synchronizovat.</translation>
+        <translation>Výběr synchronizace: Můžete dodatečně označit podadresáře, které si nepřejete synchronizovat.</translation>
    </message>
 </context>
 <context>
@@ -1565,7 +1565,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
        <source>Could not download update. Please click &lt;a href=&apos;%1&apos;&gt;here&lt;/a&gt; to download the update manually.</source>
-        <translation>Nemohu stáhnout aktualizaci. Klikněte, prosím, na &lt;a href=&apos;%1&apos;&gt;tento odkaz&lt;/a&gt; pro ruční stažení aktualizace.</translation>
+        <translation>Nemohu stáhnout aktualizaci. Klikněte prosím na &lt;a href=&apos;%1&apos;&gt;tento odkaz&lt;/a&gt; pro ruční stažení aktualizace.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="147"/>
@@ -1613,7 +1613,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/>
        <source>Setup local folder options</source>
-        <translation>Možnosti nastavení místní složky</translation>
+        <translation>Možnosti nastavení místního adresáře</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/>
@@ -1623,7 +1623,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="139"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
-        <translation>%1 složka &apos;%2&apos; je synchronizována do místní složky &apos;%3&apos;</translation>
+        <translation>%1 adresář &apos;%2&apos; je synchronizován do místního adresáře &apos;%3&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1638,7 +1638,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
        <source>Local Sync Folder</source>
-        <translation>Místní synchronizovaná složka</translation>
+        <translation>Místní synchronizovaný adresář</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
@@ -1768,7 +1768,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
-        <translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
+        <translation>Místní synchronizovaný adresář %1 již existuje, nastavuji jej pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
@@ -1788,12 +1788,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
        <source>Could not create local folder %1</source>
-        <translation>Nelze vytvořit místní složku %1</translation>
+        <translation>Nelze vytvořit místní adresář %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
        <source>No remote folder specified!</source>
-        <translation>Žádná vzdálená složka nenastavena!</translation>
+        <translation>Není nastaven žádný vzdálený adresář!</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
@@ -1803,39 +1803,39 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>creating folder on ownCloud: %1</source>
-        <translation>vytvářím složku na ownCloudu: %1</translation>
+        <translation>vytvářím adresář na ownCloudu: %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
        <source>Remote folder %1 created successfully.</source>
-        <translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation>
+        <translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
-        <translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation>
+        <translation>Vzdálený adresář %1 již existuje. Spojuji jej pro synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
        <source>The folder creation resulted in HTTP error code %1</source>
-        <translation>Vytvoření složky selhalo HTTP chybou %1</translation>
+        <translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
-        <translation>Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
+        <translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
-        <translation>Vytváření vzdálené složky %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
+        <translation>Vytváření vzdáleného adresáře %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
@@ -1855,7 +1855,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
        <source>Folder rename failed</source>
-        <translation>Přejmenování složky selhalo</translation>
+        <translation>Přejmenování adresáře selhalo</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
@@ -1865,7 +1865,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaná složka %1 byla vytvořena úspěšně!&lt;/b&gt;&lt;/font&gt;</translation>
+        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaný adresář %1 byl úspěšně vytvořen!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
 </context>
 <context>
@@ -1878,7 +1878,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
        <source>Skip folders configuration</source>
-        <translation>Přeskočit konfiguraci složek</translation>
+        <translation>Přeskočit konfiguraci adresářů</translation>
    </message>
 </context>
 <context>
@@ -1891,7 +1891,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="42"/>
        <source>Open Local Folder</source>
-        <translation>Otevřít místní složku</translation>
+        <translation>Otevřít místní adresář</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="50"/>
@@ -1953,20 +1953,20 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation type="unfinished"/>
+        <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="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Soubor se mezitím změnil</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2074,12 +2074,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
        <source>This folder must not be renamed. It is renamed back to its original name.</source>
-        <translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
+        <translation>Tento adresář nemůže být přejmenován. Byl mu vrácen původní název.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
        <source>This folder must not be renamed. Please name it back to Shared.</source>
-        <translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
+        <translation>Tento adresář nemůže být přejmenován. Přejmenujte jej prosím zpět na Shared.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
@@ -2100,48 +2100,48 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Soubor odebrán</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <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="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Chybí adresa URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2171,7 +2171,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>Folder</source>
-        <translation>Složka</translation>
+        <translation>Adresář</translation>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
@@ -2184,17 +2184,17 @@ Nedoporučuje se jí používat.</translation>
        <translation>Velikost</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Místní protokol synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopie</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopírovat záznam aktivity do schránky.</translation>
    </message>
@@ -2237,17 +2237,17 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <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é složky 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>
+        <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é podsložky, které si přejete synchronizovat.</translation>
+        <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é podsložky, které si nepřejete synchronizovat.</translation>
+        <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"/>
@@ -2545,17 +2545,17 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - ověření</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Vyžadováno opětovné ověření</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Vaše sezení vypršelo. Chcete-li pokračovat v práci, musíte se znovu přihlásit.</translation>
    </message>
@@ -2563,7 +2563,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Sdílet s %1</translation>
@@ -2857,23 +2857,23 @@ Nedoporučuje se jí používat.</translation>
        <translation>Chyba při čtení adresáře.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2893,7 +2893,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Zrušeno uživatelem</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Jméno souboru obsahuje neplatné znaky, které neumožňují synchronizaci mezi různými platformami.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Nedoporučuje se jí používat.</translation>
        <translation>Došlo k interní chybě číslo %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Jméno souboru je moc dlouhé.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat selhal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <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="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <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="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <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="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <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="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranění není povoleno, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
-        <translation>Místní soubory a sdílená složka byly odstraněny.</translation>
+        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <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="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>cílové umístění</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -3102,17 +3102,17 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="317"/>
        <source>Folder %1: %2</source>
-        <translation>Složka %1: %2</translation>
+        <translation>Adresář %1: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="322"/>
        <source>No sync folders configured.</source>
-        <translation>Nejsou nastaveny žádné synchronizované složky.</translation>
+        <translation>Nejsou nastaveny žádné synchronizované adresáře.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="332"/>
        <source>There are no sync folders configured.</source>
-        <translation>Nejsou nastaveny žádné složky pro synchronizaci.</translation>
+        <translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="340"/>
@@ -3146,12 +3146,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="367"/>
        <source>Managed Folders:</source>
-        <translation>Spravované složky:</translation>
+        <translation>Spravované adresáře:</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="370"/>
        <source>Open folder &apos;%1&apos;</source>
-        <translation>Otevřít složku &apos;%1&apos;</translation>
+        <translation>Otevřít adresář &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="342"/>
@@ -3489,7 +3489,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/>
        <source>Your entire account is synced to the local folder </source>
-        <translation>Celý váš účet je synchronizován do místní složky</translation>
+        <translation>Celý váš účet je synchronizován do místního adresáře</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/>
@@ -3509,37 +3509,37 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>V budoucnosti</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>před %n dnyëm</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nyní</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Méně než před minutou</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Před nějakým časem</translation>
    </message>
@@ -3566,38 +3566,38 @@ Nedoporučuje se jí používat.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln rok(ů)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln měsíc(ů)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dny(ů)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hodina(y)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuta(y)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln sekunda(y)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1000,12 +1000,12 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
@@ -1023,7 +1023,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Pfad zum lokalen Verzeichnis eingeben</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Den Quellordner wählen</translation>
    </message>
@@ -1031,52 +1031,52 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Entfernten Ordner erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Geben Sie den Namen des neuen, unter &apos;%1&apos; zu erstellenden Ordners ein: </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Order erfolgreich auf %1 erstellt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Konnte Ordner nicht listen. Fehler: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Dieser Ordner wird bereits synchronisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1084,7 +1084,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1954,17 +1954,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <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="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2098,48 +2098,48 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <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="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2182,17 +2182,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokales Sychronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
    </message>
@@ -2543,17 +2543,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifikation</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Erneute Authentifizierung erforderlich</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Ihre Sitzung ist abgelaufen. Sie müssen sich zur weiteren Nutzung des Clients neu Anmelden.</translation>
    </message>
@@ -2561,7 +2561,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Via %1 teilen</translation>
@@ -2855,23 +2855,23 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Fehler beim Lesen eines Ordners.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2891,7 +2891,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Dateiname enthält Zeichen die nicht auf allen Betriebssystemen dargestellt werden können.</translation>
    </message>
@@ -2931,109 +2931,109 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Ein interner Fehler mit der Fehlernummer %1  ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Der Dateiname ist zu lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Dateikodierung ist ungültig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <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="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <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="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3507,37 +3507,37 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>in der Zukunft</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>jetzt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>vor weniger als einer Minute</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>vor einiger Zeit</translation>
    </message>
@@ -3564,38 +3564,38 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln Jahr(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln Monat(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln Tag(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln Stunde(n)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln Minute(n)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln Sekunde(n)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -999,12 +999,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
    </message>
@@ -1022,7 +1022,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Εισάγετε τη διαδρομή προς τον τοπικό φάκελο.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Επιλογή του φακέλου προέλευσης</translation>
    </message>
@@ -1030,52 +1030,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Εισάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου &lt;b&gt;δεν&lt;/b&gt; υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation>
    </message>
@@ -1083,7 +1083,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
    </message>
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2182,17 +2182,17 @@ It is not advisable to use it.</source>
        <translation>Μέγεθος</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
    </message>
@@ -2543,17 +2543,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Πιστοποίηση</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Απαιτείται επανάληψη πιστοποίησης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation>
    </message>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Διαμοιρασμός με %1</translation>
@@ -2855,23 +2855,23 @@ It is not advisable to use it.</source>
        <translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
    </message>
@@ -2891,7 +2891,7 @@ It is not advisable to use it.</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
    </message>
@@ -2931,109 +2931,109 @@ It is not advisable to use it.</source>
        <translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3507,37 +3507,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3564,38 +3564,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln έτος(η)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln μήνας(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln ημέρα(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ώρα(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln λεπτό(ά)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln δευτερόλεπτο(α)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1028,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1051,7 +1051,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1059,52 +1059,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1112,7 +1112,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1975,17 +1975,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2119,48 +2119,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2203,17 +2203,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2564,17 +2564,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2582,7 +2582,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"></translation>
@@ -2874,23 +2874,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2910,7 +2910,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2950,109 +2950,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3526,12 +3526,12 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -3539,7 +3539,7 @@ It is not advisable to use it.</source>
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -3547,17 +3547,17 @@ It is not advisable to use it.</source>
        </translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -3565,7 +3565,7 @@ It is not advisable to use it.</source>
        </translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3592,38 +3592,56 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation type="unfinished"></translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation type="unfinished"></translation>
    </message>
@@ -218,7 +218,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
-        <translation>Ingresar</translation>
+        <translation>Iniciar sesión</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="636"/>
@@ -440,17 +440,17 @@
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="351"/>
        <source>You received %n new notification(s) from %2.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificacióne(s) de %2.</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="359"/>
        <source>You received %n new notification(s) from %1 and %2.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificacióne(s) de %1 y de %2.</numerusform></translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="361"/>
        <source>You received new notifications from %1, %2 and other accounts.</source>
-        <translation type="unfinished"/>
+        <translation>Ha recibido nuevas notificaciónes de %1, %2 y otras cuentas.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="365"/>
@@ -1001,12 +1001,12 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Añadir Conexión para el Directorio de Sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Añadir Sincronización de Conexión</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
        <translation>Ingrese la ruta de la carpeta local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleccione la carpeta de origen</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduzca más abajo el nombre de la nueva carpeta que crear &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La carpeta fue creada con éxito en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Falló la autenticación al acceder a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Falló al listar una carpeta. Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Elija esto para sincronizar la cuenta entera</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Este directorio ya se ha sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ya ha sincronizado &lt;i&gt;%1&lt;/i&gt;, el cual es la carpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Todavía se están sincronizando ficheros. &lt;b&gt;No&lt;/b&gt; se admite la sincronización de otras carpetas. Si quiere sincronizar múltiples carpetas, por favor revise la carpeta raíz configurada.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Elija qué sinconizar: Opcionalmente puede deseleccionar subcarpetas remotas que no desee sincronizar</translation>
    </message>
@@ -1684,7 +1684,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
        <source>&amp;Email</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Email</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
@@ -1952,20 +1952,20 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation type="unfinished"/>
+        <translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>El archivo ha cambiado desde que fue descubierto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -2099,48 +2099,48 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Archivo eliminado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Un archivo local fue modificado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt&lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Falta la URL de la encuesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>El archivo local ha sido eliminado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -2183,17 +2183,17 @@ No se recomienda usarla.</translation>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocolo de sincronización local</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copie la lista de actividades al portapapeles</translation>
    </message>
@@ -2384,7 +2384,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="113"/>
        <source>Retrieving maximum possible sharing permissions from server...</source>
-        <translation type="unfinished"/>
+        <translation>Descargando el maximo número de permisos compartidos del servidor...</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2544,17 +2544,17 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticar</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Debe volver a autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Su sesión ha caducado. Necesita volver a iniciarla para continuar usando el cliente.</translation>
    </message>
@@ -2562,7 +2562,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartir con %1</translation>
@@ -2856,23 +2856,23 @@ No se recomienda usarla.</translation>
        <translation>Error al leer el directorio.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>No permitido porque no tienes permiso para añadir un directorio padre</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>No permitido porque no tienes permiso para añadir archivos a ese directorio</translation>
    </message>
@@ -2892,7 +2892,7 @@ No se recomienda usarla.</translation>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>El nombre del archivo contiene caracteres inválidos que no pueden ser sincronizados entre las plataformas.</translation>
    </message>
@@ -2932,109 +2932,109 @@ No se recomienda usarla.</translation>
        <translation>Ocurrió un error interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>El elemento no está sincronizado por errores previos: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>No se admiten enlaces simbólicos en la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fichero está en la lista de ignorados</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>El nombre del archivo es demasiado largo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat ha fallado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Los caracteres del nombre de fichero no son válidos</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres inválidos, por favor renombre &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>No se ha podido leer desde el registro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>No es posible abrir el diario de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Nombre de archivo contiene al menos un caracter no válido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado porque se encuentra en la lista negra de &quot;elija qué va a sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>No permitido porque no tienes permiso para añadir subdirectorios a ese directorio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No está permitido borrar, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Se han eliminado los archivos locales y la carpeta compartida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>No está permitido mover, elemento restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -3508,37 +3508,37 @@ No se recomienda usarla.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>en el futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>Hace %n día(s)</numerusform><numerusform>Hace %n día(s)</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>Hace %n hora(s)</numerusform><numerusform>Hace %n hora(s)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>ahora</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Hace menos de un minuto</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>Hace %n minutos(s)</numerusform><numerusform>Hace %n minutos(s)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Hace unos momentos</translation>
    </message>
@@ -3565,38 +3565,38 @@ No se recomienda usarla.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln año(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln meses(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dia(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundos(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -996,12 +996,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Ingrese el path al directorio local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleccioná el directorio origen</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>El directorio fue creado con éxito en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Seleccioná acá para sincronizar la cuenta completa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Este folder ya está siendo sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es el directorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar la lista de actividades al portapapeles.</translation>
    </message>
@@ -2532,17 +2532,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3495,37 +3495,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3552,38 +3552,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -996,12 +996,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sisesta otsingutee kohaliku kataloogini.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Vali algne kaust</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Loo kaugkaust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 - kaust on loodud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Vali see sünkroniseering tervele kontole</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Seda kataloogi juba sünkroniseeritakse.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sa juba sünkroniseerid &lt;i&gt;%1&lt;/i&gt;, mis on &lt;i&gt;%2&lt;/i&gt; ülemkataloog.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1944,17 +1944,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Faili on pärast avastamist muudetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2088,48 +2088,48 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <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="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Küsitluse URL puudub</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2172,17 +2172,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Suurus</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
    </message>
@@ -2533,17 +2533,17 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Vajalik on uuesti autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Sinu sessioon on aegunud. Sa pead kliendi kasutamiseks uuesti sisse logima.</translation>
    </message>
@@ -2551,7 +2551,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Jagatud kasutajaga %1</translation>
@@ -2845,23 +2845,23 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2881,7 +2881,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2921,109 +2921,109 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Faili nimi on liiga pikk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Failinime kodeering pole kehtiv</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3497,37 +3497,37 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>tulevikus</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>kohe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Vähem kui minut tagasi</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Mõni aeg tagasi</translation>
    </message>
@@ -3554,38 +3554,38 @@ Selle kasutamine pole soovitatav.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln aasta(t)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln kuu(d)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln päeva(a)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln tund(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minut(it)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln sekund(it)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -996,12 +996,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Gehitu Sinkronizazio Konexioa</translation>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sartu bertako karpeta berriaren bidea:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Hautatu jatorrizko karpeta</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Sortu Urruneko Karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Sartu behean sortuko den karpeta berriaren izena &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1-en karpeta ongi sortu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentikazioak huts egin du %1en sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Karpetaren zerrenda lortzeak huts egin du: Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Hautatu hau kontu osoa sinkronizatzeko</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Dagoeneko  &lt;i&gt;%1&lt;/i&gt; sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren guraso karpeta dena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2094,48 +2094,48 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fitxategia Ezabatua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2178,17 +2178,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Tamaina</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Bertako sinkronizazio protokolo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiatu jarduera zerrenda arbelara.</translation>
    </message>
@@ -2539,17 +2539,17 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Berautentikatzea beharrezkoa</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2557,7 +2557,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2849,23 +2849,23 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2885,7 +2885,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2925,109 +2925,109 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Ezin da sinkronizazio egunerokoa ireki</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <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="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3501,37 +3501,37 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Orain dela minutu bat baino gutxiago</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3558,38 +3558,38 @@ Ez da gomendagarria erabltzea.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln urte</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln hilabete</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln egun</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ordu</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minutu</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundu</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -996,12 +996,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>پوشه ی اصلی را انتخاب کنید</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>پوشه با موفقیت ایجاد شده است  %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>این پوشه همگام‌سازی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>فایل حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>اندازه</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>کپی کردن</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
@@ -2532,17 +2532,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>اشتراک‌گذاری با %1</translation>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation>خطا در هنگام خواندن پوشه</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>متوقف شده توسط کاربر</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation>یک خطای داخلی با شماره خطای  %1  رخ داده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>نام فایل خیلی طولانی است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>وضعیت ناموفق</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>رمزگذاری نام فایل معتبر نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>کاراکتر نامعتبر، لطفا &quot;%1&quot; را تغییر نام دهید</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>حذف مجاز نیست، در حال بازگردادن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>فایل‌های محلی و پوشه‌ی اشتراک حذف شد.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3494,37 +3494,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3551,38 +3551,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln سال(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln ماه(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln روز(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ساعت(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln دقیقه (s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln ثانیه(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -997,12 +997,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Lisää kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Lisää synkronointiyhteys</translation>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Anna paikallisen kansion polku</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Valitse lähdekansio</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Luo etäkansio</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Kansion listaaminen epäonnistui. Virhe: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Valitse tämä synkronoidaksesi koko tilin</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Tätä kansiota synkronoidaan jo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Synkronoit jo kansiota &lt;i&gt;%1&lt;/i&gt;, ja se on kansion &lt;i&gt;%2&lt;/i&gt; yläkansio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1951,17 +1951,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2095,48 +2095,48 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2179,17 +2179,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Koko</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Paikallinen synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopioi toimilista leikepöydälle.</translation>
    </message>
@@ -2540,17 +2540,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Tunnistaudu</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Tunnistaudu uudelleen</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Istunto on vanhentunut. Kirjaudu uudelleen jatkaaksesi sovelluksen käyttämistä.</translation>
    </message>
@@ -2558,7 +2558,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2852,23 +2852,23 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Kansiota lukiessa tapahtui virhe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2888,7 +2888,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Tiedoston nimi sisältää virheellisiä merkkejä, joita ei voi synkronoida alustariippumattomasti.</translation>
    </message>
@@ -2928,109 +2928,109 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Sisäinen virhe, numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Tiedosto on ohituslistalla.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Tiedoston nimi on liian pitkä.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <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="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3504,37 +3504,37 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>tulevaisuudessa</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n päivä sitten</numerusform><numerusform>%n päivää sitten</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n tunti sitten</numerusform><numerusform>%n tuntia sitten</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nyt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Alle minuutti sitten</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuutti sitten</numerusform><numerusform>%n minuuttia sitten</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Jokin aika sitten</translation>
    </message>
@@ -3561,38 +3561,38 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <source>%L1 B</source>
        <translation>%L1 t</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln v</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln kk</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln pv</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln t</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln min</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln s</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1001,12 +1001,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ajouter une synchronisation de dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Ajouter une Synchronisation</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
        <translation>Entrez le chemin du dossier local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Sélectionnez le dossier source</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Créer un dossier distant</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Entrez le nom du nouveau dossier à créer dans &apos;%1&apos; :</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Le dossier a été créé sur %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Erreur d&apos;authentification lors de l&apos;accès à %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Impossible de lister un répertoire. Erreur : %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Sélectionnez ceci pour synchroniser l&apos;ensemble du compte</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Ce dossier est déjà en cours de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Vous synchronisez déja &lt;i&gt;%1&lt;/i&gt;, qui est un dossier parent de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1085,7 +1085,7 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1956,17 +1956,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <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="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <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>
@@ -2100,48 +2100,48 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fichier supprimé</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>URL de sondage manquante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Fichier local supprimé pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <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>
@@ -2184,17 +2184,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocole de synchronisation locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copier la liste d&apos;activités dans le presse-papier.</translation>
    </message>
@@ -2545,17 +2545,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifier</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Nouvelle authentification nécessaire</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Votre session a expiré. Vous devez vous connecter à nouveau pour continuer à utiliser le client.</translation>
    </message>
@@ -2563,7 +2563,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Partager avec %1</translation>
@@ -2857,23 +2857,23 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Erreur lors de la lecture du dossier.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2893,7 +2893,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Interrompu par l&apos;utilisateur</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Le nom de fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Une erreur interne numéro %1 est survenue.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Le nom de fichier est trop long.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat échoué.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <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="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <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="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <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="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <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="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <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="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -3509,37 +3509,37 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>Dans le futur</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>maintenant</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Il y a moins d&apos;une minute</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Il y a quelque temps</translation>
    </message>
@@ -3566,38 +3566,38 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <source>%L1 B</source>
        <translation>%L1 octets</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln an(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mois</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln jour(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln heure(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minute(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln seconde(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -997,12 +997,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Escriba a ruta ao cartafol local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Escolla o cartafol de orixe</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crear un cartafol remoto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Creouse correctamente o cartafol en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Non foi posíbel facer a autenticación accedendo a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolla isto para sincronizar toda a conta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Este cartafol xa está sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, é o cartafol pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1950,17 +1950,17 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2094,48 +2094,48 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <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="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Non se atopa o URL requirido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2178,17 +2178,17 @@ Recomendámoslle que non o use.</translation>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista da actividade no portapapeis.</translation>
    </message>
@@ -2539,17 +2539,17 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticado</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>É necesario volver autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Caducou a sesión. É necesario que volva a acceder para seguir usando o cliente. </translation>
    </message>
@@ -2557,7 +2557,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartir con %1</translation>
@@ -2851,23 +2851,23 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2887,7 +2887,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Interrompido polo usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>O nome de ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
    </message>
@@ -2927,109 +2927,109 @@ Recomendámoslle que non o use.</translation>
        <translation>Produciuse un erro interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Fallou a obtención de estatísticas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <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="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <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="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -3503,37 +3503,37 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3560,38 +3560,38 @@ Recomendámoslle que non o use.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ano(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mes(es)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln día(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -996,12 +996,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Adjon meg a helyi könyvtár elérési útját.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Forrás könyvtár kiválasztása</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>A mappa sikeresen létrehozva: %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Ez a mappa már szinkronizálva van.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1947,17 +1947,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2091,48 +2091,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fájl törölve</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2175,17 +2175,17 @@ It is not advisable to use it.</source>
        <translation>Méret</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Másolás</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Az aktivitási lista másolása a vágólapra.</translation>
    </message>
@@ -2536,17 +2536,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Azonosítás</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Felhasználóazonosítás szükséges</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2554,7 +2554,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Megosztás vele: %1</translation>
@@ -2847,23 +2847,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2883,7 +2883,7 @@ It is not advisable to use it.</source>
        <translation>Felhasználó megszakította</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2923,109 +2923,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Fájlnév túl nagy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>a cél</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a forrás</translation>
    </message>
@@ -3499,37 +3499,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3556,38 +3556,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%ln év</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%ln hónap</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln nap</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln óra</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln perc</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln másodperc</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1001,12 +1001,12 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Aggiungi connessione di sincronizzazione</translation>
    </message>
@@ -1024,7 +1024,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
        <translation>Digita il percorso della cartella locale.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleziona la cartella di origine</translation>
    </message>
@@ -1032,52 +1032,52 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crea cartella remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Digita il nome della nuova cartella da creare sotto a &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La cartella è stata creata correttamente su %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autenticazione non riuscita durante l&apos;accesso a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Impossibile elencare una cartella. Errore: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Selezionala per sincronizzare l&apos;intero account</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Questa cartella è già sincronizzata.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è la cartella superiore di &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1085,7 +1085,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1955,17 +1955,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2099,48 +2099,48 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <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="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>URL di richiesta mancante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <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/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2183,17 +2183,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Dimensione</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocollo di sincronizzazione locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia l&apos;elenco delle attività negli appunti.</translation>
    </message>
@@ -2544,17 +2544,17 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Nuova autenticazione richiesta</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>La tua sessione è scaduta. Devi effettuare nuovamente l&apos;accesso per continuare a utilizzare il client.</translation>
    </message>
@@ -2562,7 +2562,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Condividi con %1</translation>
@@ -2856,23 +2856,23 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Errore durante la lettura della cartella.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2892,7 +2892,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Interrotto dall&apos;utente</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Il nome del file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
    </message>
@@ -2932,109 +2932,109 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>SI è verificato un errore interno numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Il nome del file è troppo lungo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat non riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <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="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <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="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <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="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -3508,37 +3508,37 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>nel futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>adesso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Meno di un minuto fa</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Tempo fa</translation>
    </message>
@@ -3565,38 +3565,38 @@ Non è consigliabile utilizzarlo.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln anno(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mese(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln giorno(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ora(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(i)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln secondo(i)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -68,12 +68,12 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="56"/>
        <source>Lorem ipsum dolor sit amet</source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="69"/>
        <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -1001,12 +1001,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>同期フォルダーを追加</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>同期接続を追加</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>ローカルフォルダーのパスを入力してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>ソースフォルダーを選択</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>リモートフォルダーを追加</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation> &apos;%1&apos;の下に新しいフォルダーの名前を入力:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 にフォルダーが作成されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>%1 アクセス中に認証に失敗しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>フォルダーをリストアップできません。エラー: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>アカウント全体を同期する場合はこちらを選択</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>このフォルダーはすでに同期されています。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>&lt;i&gt;%1&lt;/i&gt;は、&lt;i&gt;%2&lt;/i&gt;の親フォルダーですでに同期しています。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>すべてのファイルはすでに同期されています。他のフォルダーの同期は&lt;b&gt;サポートしていません&lt;/&gt;。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation>
    </message>
@@ -1085,7 +1085,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>何を同期するか選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
    </message>
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
        <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>ファイルは発見以降に変更されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>ファイルを削除しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>ポーリングURLがありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>ローカルファイルを同期中に削除します。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -2182,17 +2182,17 @@ It is not advisable to use it.</source>
        <translation>サイズ</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>ローカルファイル同期状況</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>コピー</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>アクティビティ一覧をコピーする</translation>
    </message>
@@ -2543,17 +2543,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - 認証</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>再認証が必要</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>セッションの期限が切れました。クライアントを使用し続けるには再ログインが必要です。</translation>
    </message>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>%1 と共有</translation>
@@ -2855,23 +2855,23 @@ It is not advisable to use it.</source>
        <translation>フォルダーの読み込みエラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>隠しファイル/フォルダのため無視されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>そのフォルダーにファイルを追加する権限がありません</translation>
    </message>
@@ -2891,7 +2891,7 @@ It is not advisable to use it.</source>
        <translation>ユーザーによって中止されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>異なるプラットフォームOS間で利用できない不正な文字コードがファイル名に含まれているため、同期できません。</translation>
    </message>
@@ -2931,109 +2931,109 @@ It is not advisable to use it.</source>
        <translation>内部エラー番号 %1 が発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>同期機能はシンボリックリンクをサポートしていません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>ファイルは除外リストに登録されています。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>ファイル名が長すぎます</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>情報取得エラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>ファイル名のエンコーディングが無効です。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>無効な文字です、&quot;%1&quot; を変更してください。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>同期ジャーナルの初期化ができません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>ローカルデータベースからブラックリストを読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>同期ジャーナルから読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>同期ジャーナルを開くことができません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>削除できないので復元しています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>ローカルファイルと共有フォルダーを削除しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>移動できないので項目を復元しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 は読み取り専用のため移動できません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -3507,37 +3507,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>今後</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n日前</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n 時間前</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>今</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>1分以内</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform> %n 分前</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>数分前</translation>
    </message>
@@ -3564,38 +3564,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln年</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Lnヶ月</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln日</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln時間</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln分</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln秒</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1001,12 +1001,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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Legg til mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Legg til tilkobling for synkronisering</translation>
    </message>
@@ -1024,7 +1024,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
        <translation>Legg inn stien til den lokale mappen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Velg kildemappe</translation>
    </message>
@@ -1032,52 +1032,52 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Opprett ekstern mappe</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Oppgi navnet på den nye mappen som skal opprettes under &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Mappen ble opprettet på %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentisering feilet ved tilgang til %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Klarte ikke å liste en mappe. Feil: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Velg dette for å synkronisere en hel konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Denne mappen synkroniseres allerede.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Du synkroniserer allerede &lt;i&gt;%1&lt;/i&gt;, som er foreldremappe for &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1085,7 +1085,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1956,17 +1956,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2100,48 +2100,48 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fil fjernet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Forespørsels-URL mangler</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Den lokale filen ble fjernet under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2184,17 +2184,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Størrelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokal synkroniseringsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopier aktivitetslisten til utklippstavlen.</translation>
    </message>
@@ -2545,17 +2545,17 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autentiser</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Ny autentisering kreves</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Økten din har utløpt. Du må logge inn på nytt for å fortsette å bruke klienten.</translation>
    </message>
@@ -2563,7 +2563,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Del med %1</translation>
@@ -2857,23 +2857,23 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Feil ved lesing av mappe.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2893,7 +2893,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Avbrutt av brukeren</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Filnavnet inneholder ugyldige tegn som ikke kan synkroniseres på tvers av plattformer.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>En intern feil nummer %1 oppstod.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Filen ligger på ignoreringslisten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Filnavn er for langt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Filnavn-koding er ikke gyldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan ikke åpne synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ikke tillatt å fjerne, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale filer og delingsmappe fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Flytting ikke tillatt, element gjenopprettet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>målet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>kilden</translation>
    </message>
@@ -3509,37 +3509,37 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>fram i tid</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nå</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>For mindre enn et minutt siden</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>For en stund siden</translation>
    </message>
@@ -3566,38 +3566,38 @@ Det er ikke tilrådelig å bruke den.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln år</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln måned(er)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dag(er)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln time(r)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minutt(er)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln sekund(er)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -631,42 +631,42 @@
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="515"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="522"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
-        <translation type="unfinished"/>
+        <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="536"/>
        <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>
+        <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="538"/>
@@ -1002,12 +1002,12 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Toevoegen Sync verbinding</translation>
    </message>
@@ -1025,7 +1025,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
        <translation>Geef het pad op naar de lokale map.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Selecteer de bronmap</translation>
    </message>
@@ -1033,52 +1033,52 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Externe map aanmaken</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Voer de naam van de hieronder te maken nieuwe map in &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Map is succesvol aangemaakt op %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Authenticatie mislukt bij benaderen %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Tonen mappenlijst mislukt. Fout: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Kies dit om uw volledige account te synchroniseren</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Deze map is al gesynchroniseerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>U synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1086,7 +1086,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1954,20 +1954,20 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation type="unfinished"/>
+        <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="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <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="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2101,48 +2101,48 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <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="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <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/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>URL opvraag ontbreekt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <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>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2185,17 +2185,17 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Grootte</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokaal sync protocol</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopiëren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopieer de activiteitenlijst naar het klembord.</translation>
    </message>
@@ -2386,7 +2386,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="113"/>
        <source>Retrieving maximum possible sharing permissions from server...</source>
-        <translation type="unfinished"/>
+        <translation>Maximum aantal mogelijke permissies van de server ophalen...</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2546,17 +2546,17 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - authenticeren</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Hernieuwde authenticatie nodig</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Uw sessie is verstreken. U moet opnieuw inloggen om de client-applicatie te gebruiken.</translation>
    </message>
@@ -2564,7 +2564,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Delen met %1</translation>
@@ -2858,23 +2858,23 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Fout tijdens lezen map.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2894,7 +2894,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Afgebroken door de gebruiker</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Bestandsnaam bevat ongeldige tekens die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
    </message>
@@ -2934,109 +2934,109 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Een interne fout met nummer %1 is opgetreden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>De bestandsnaam is te lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Bestandsnaamcodering is niet geldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <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="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <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="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <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="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan om te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <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="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -3510,37 +3510,37 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>in de toekomst</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Minder dan een minuut geleden</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Even geleden</translation>
    </message>
@@ -3567,38 +3567,38 @@ We adviseren deze site niet te gebruiken.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ja(a)r(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln maand(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dag(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln u(u)r(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minu(u)t(en)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln seconde(n)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -3639,7 +3639,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
        <source>Server version downloaded, copied changed local file into conflict file</source>
-        <translation type="unfinished"/>
+        <translation>Serverversie gedownload, gewijzigde lokale bestand gekopieerd in conflictbestand</translation>
    </message>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
@@ -68,12 +68,12 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="56"/>
        <source>Lorem ipsum dolor sit amet</source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="69"/>
        <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -375,7 +375,7 @@
        <location filename="../src/gui/activitywidget.cpp" line="580"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
-        <translation type="unfinished"/>
+        <translation>Niezsynchronizowany (%1)</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="596"/>
@@ -430,7 +430,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="139"/>
        <source>Action Required: Notifications</source>
-        <translation type="unfinished"/>
+        <translation>Wymagana akcja: Powiadomienia</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="144"/>
@@ -450,12 +450,12 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="361"/>
        <source>You received new notifications from %1, %2 and other accounts.</source>
-        <translation type="unfinished"/>
+        <translation>Otrzymałeś nowe powiadomienia z %1, %2 i innych kont.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="365"/>
        <source>%1 Notifications - Action Required</source>
-        <translation type="unfinished"/>
+        <translation>%1 Powiadomień - Wymagana akcja</translation>
    </message>
 </context>
 <context>
@@ -524,7 +524,7 @@
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -661,7 +661,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
-        <translation type="unfinished"/>
+        <translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="536"/>
@@ -1001,12 +1001,12 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Dodaj folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Dodaj połączenie synchronizacji</translation>
    </message>
@@ -1024,7 +1024,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
        <translation>Wpisz ścieżkę do folderu lokalnego.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Wybierz katalog źródłowy</translation>
    </message>
@@ -1032,52 +1032,52 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Dodaj zdalny katalog</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Folder został utworzony pomyślnie na %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Błąd autentykacji w dostępie do %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Wybierz to, aby zsynchronizować całe konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Ten katalog jest już synchronizowany.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Synchronizujesz już &lt;i&gt;%1&lt;/i&gt;, który jest folderem nadrzędnym &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <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>
@@ -1085,7 +1085,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <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>
@@ -1920,7 +1920,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -1938,17 +1938,17 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
        <source>Free space on disk is less than %1</source>
-        <translation type="unfinished"/>
+        <translation>Wolne miejsce na dysku jest mniejsze niż %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
        <source>File was deleted from server</source>
-        <translation type="unfinished"/>
+        <translation>Plik został usunięty z serwera</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
        <source>The file could not be downloaded completely.</source>
-        <translation type="unfinished"/>
+        <translation>Ten plik nie mógł być całkowicie pobrany.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
@@ -1956,19 +1956,19 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <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="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -2009,7 +2009,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -2040,7 +2040,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -2066,7 +2066,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -2094,56 +2094,56 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Usunięto plik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
 </context>
 <context>
@@ -2184,17 +2184,17 @@ Niezalecane jest jego użycie.</translation>
        <translation>Rozmiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokalny protokół synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopiuj</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiuj listę aktywności do schowka.</translation>
    </message>
@@ -2545,17 +2545,17 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Uwierzytelnienia</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Wymagana powtórna autoryzacja</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Twoja sesja wygasła. Musisz ponownie się zalogować, aby nadal używać klienta</translation>
    </message>
@@ -2563,7 +2563,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Współdzielone z %1</translation>
@@ -2857,23 +2857,23 @@ Niezalecane jest jego użycie.</translation>
        <translation>Błąd podczas odczytu katalogu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <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="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <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="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <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="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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>
@@ -2893,7 +2893,7 @@ Niezalecane jest jego użycie.</translation>
        <translation>Anulowane przez użytkownika</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Nazwa pliku zawiera niedozwolone znaki, przez co może nie być synchronizowany.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <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="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Nazwa pliku zbyt długa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Błąd statystyk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <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="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <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="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <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="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <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="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <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="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <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="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -3510,37 +3510,37 @@ Kliknij</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>w przyszłości</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>teraz</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Mniej niż minutę temu</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Jakiś czas temu</translation>
    </message>
@@ -3567,38 +3567,38 @@ Kliknij</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln rok(lat)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln miesiąc(ęcy)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dzień(dni)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation type="unfinished"/>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -1001,12 +1001,12 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Adicionar Conexão de Sincronização de pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Adicionar Conexão de Sincronização</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
        <translation>Entre com o caminha para a pasta local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Selecione a pasta de origem</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Criar uma Pasta Remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Entre com o nome da nova pasta a ser criada abaixo &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Pasta foi criada com sucesso em %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Falha na autenticação acessando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Falha ao listar uma pasta. Erro: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolha esta opção para sincronizar a conta inteira</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Esta pasta já está sendo sincronizada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma pasta mãe de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Você já está sincronizando todos os seus arquivos. Sincronizar outra pasta &lt;b&gt;não&lt;/ b&gt; é possível. Se você deseja sincronizar várias pastas, por favor, remova a sincronização configurada atualmente para a pasta raiz.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Escolha o que Sincronizar: Você pode, opcionalmente, desmarcar subpastas remotas que você não deseja sincronizar.</translation>
    </message>
@@ -1956,17 +1956,17 @@ It is not advisable to use it.</source>
        <translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Arquivo foi alterado desde a descoberta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -2100,48 +2100,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Arquivo Removido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Arquivo local modificado durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <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 arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Faltando conjunto de URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>O arquivo local foi removido durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -2184,17 +2184,17 @@ It is not advisable to use it.</source>
        <translation>Tamanho</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocolo de sincronização local</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista de atividades para a área de transferência.</translation>
    </message>
@@ -2545,17 +2545,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticar</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Reautenticação necessária</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Sua sessão expirou. É preciso re-login para continuar a usar o cliente.</translation>
    </message>
@@ -2563,7 +2563,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="441"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartilhar com %1</translation>
@@ -2857,23 +2857,23 @@ It is not advisable to use it.</source>
        <translation>Erro ao ler pasta.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
    </message>
@@ -2893,7 +2893,7 @@ It is not advisable to use it.</source>
        <translation>Abortado pelo usuário</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Nome do arquivo contém caracteres inválidos que não podem ser sincronizados entre plataformas.</translation>
    </message>
@@ -2933,109 +2933,109 @@ It is not advisable to use it.</source>
        <translation>Um erro interno de número %1 ocorreu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>O item não está sincronizado devido a erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Linques simbólicos não são suportados em sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>O arquivo está listado na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>O nome do arquivo é muito longo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat falhou.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>A codificação do nome do arquivo não é válida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres inválidos, por favor renomear &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibilitado de iniciar a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Não é possível ler a partir do relatório de sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Não é possível abrir o arquivo de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome do arquivo contem pelo menos um caractere inválido  </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não é permitido remover, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Arquivos locais e pasta compartilhada removida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Não é permitido mover, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Não é permitido mover porque %1 é somente para leitura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a fonte</translation>
    </message>
@@ -3509,37 +3509,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>no futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>agora</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>A menos de um minuto atrás</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Algum tempo atrás</translation>
    </message>
@@ -3566,38 +3566,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ano(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mês(es)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dia(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Matthew Leeds	f61c7e0dce	Fix typo in folder.cpp	2016-05-27 18:13:51 +02:00
Daniel Molkentin	a2b238e2e5	Undo regression caused by `727e73d` normalization to NFC is still required. Mac OS API will not take care of that by default. Resolves #4884	2016-05-27 16:03:59 +02:00
ckamm	0e2c16e827	Certs: Re-ask for different cert after rejection #4898 (#4911 ) Previously rejecting any kind of certificate meant that the user was never asked again, even if the certificate changed. Now we keep track of which certificates were rejected and ask again if the ones mentioned in the ssl errors change. mitmproxy is excellent for testing this.	2016-05-27 12:08:42 +02:00
ckamm	b9fdae6d67	Progress: Don't count items without propagation jobs #4856 (#4910 ) * Progress: Don't count dirs without propagation jobs #4856 These directory SyncFileItems are necessary for bookkeeping but should not influence the progress display at all. * Progress: Skip ignored files #4856	2016-05-27 10:52:00 +02:00
Jenkins for ownCloud	c34115610e	[tx-robot] updated from transifex	2016-05-27 02:19:21 -04:00
Olivier Goffart	275ad1e157	Utility: Better fix for the translation of minutes, seconds, ... The plural was not translated because of QTBUG-3945. Work around it. Issue #4855	2016-05-26 12:17:16 +02:00
Jenkins for ownCloud	1855950fa1	[tx-robot] updated from transifex	2016-05-26 02:33:30 -04:00
Olivier Goffart	fff5c280b3	SyncEngine: cleanup setting isDirectory	2016-05-25 16:27:40 +02:00
Olivier Goffart	e960b265a8	Merge remote-tracking branch '2.1' into 2.2	2016-05-25 16:23:58 +02:00
Olivier Goffart	f6b35e5d58	SyncEngine: invalid the blacklist entry when the rename destination change The problem in this case is if we rename the file "xxx" to "invalid\file". The rename will fail because the new filename constains a slash, and it will be blacklisted. But then if the user re-rename the file to "valid_name", then we should invalidate the blacklist entry and retry to upload. But we did not do that because renaming don't change the mtime and we did not store the rename target in the database IL issue 558	2016-05-25 15:32:45 +02:00
Jenkins for ownCloud	1d93af5f64	[tx-robot] updated from transifex	2016-05-25 02:19:18 -04:00
Markus Goetz	75efa8b252	sqlite: Update bundled version to 3.13.0 For OS X and Windows.	2016-05-24 17:27:31 +02:00
Markus Goetz	009a0b03da	Add ChangeLog for 2.2.1	2016-05-24 17:04:04 +02:00
Jenkins for ownCloud	8379a36a75	[tx-robot] updated from transifex	2016-05-24 07:40:14 -04:00
Daniel Molkentin	2f1a40ff7c	Travis coverity: Enforce Ubuntu 14.04 env, fix repo	2016-05-24 11:30:03 +02:00
Daniel Molkentin	c041ca6163	Fix pot. mem leak found by coverity (CID 96004)	2016-05-24 11:21:33 +02:00
Daniel Molkentin	eacc0c8bd6	Fix pot. mem leak found by coverity (CID 12900)	2016-05-24 11:21:33 +02:00
Jenkins for ownCloud	171de99e00	[tx-robot] updated from transifex	2016-05-24 02:19:53 -04:00
ckamm	bf02ccc1e8	Remember to upload files that are locked during a sync run (#4865 ) See owncloud/enterprise#1342	2016-05-23 09:03:03 +02:00
Jenkins for ownCloud	7ba961c21a	[tx-robot] updated from transifex	2016-05-23 02:19:05 -04:00
Jenkins for ownCloud	cb7be78352	[tx-robot] updated from transifex	2016-05-22 02:19:13 -04:00
Jenkins for ownCloud	6cb194e0d5	[tx-robot] updated from transifex	2016-05-21 02:19:09 -04:00
Markus Goetz	552ba94c41	SyncEngine: Set isDirectory before syncItemDiscovered (cherry picked from commit `fc1933803e`)	2016-05-20 17:00:22 +02:00
Markus Goetz	fc1933803e	SyncEngine: Set isDirectory before syncItemDiscovered	2016-05-20 16:58:44 +02:00
Markus Goetz	46e4ec3183	Checksums: Use SHA1 like in >=2.2	2016-05-20 16:31:47 +02:00
Olivier Goffart	03e3b3bf50	Upload: put the job in the active list while doing the checksum computation. This fixes an issue in which too many jobs are started un parallel while uploading many files, which could cause too much memory usage as the chunks are stored in memory. Probably the fix for #4611	2016-05-20 16:28:27 +02:00
Christian Kamm	9aed8dbce8	Checksums: Compute content checksum on download #4375 Cherry-picked from `d6d35029`	2016-05-20 16:06:30 +02:00
ckamm	c6794cd338	Progress info: Reset between syncs #4856 (PR #4872 )	2016-05-20 15:07:54 +02:00
Jenkins for ownCloud	65ec1b74d5	[tx-robot] updated from transifex	2016-05-20 02:19:16 -04:00
Jenkins for ownCloud	1a3c9a9c1a	[tx-robot] updated from transifex	2016-05-19 02:19:20 -04:00
Markus Goetz	a038c99232	Upload: Remove bandwidth quota debug message #4837	2016-05-18 16:18:13 +02:00
Olivier Goffart	30c8fa1c93	Utility: Fix translation of second, minute, hour Issue #4855 A typo in the context string made the translation lookup fail. But also the %Ln was not recognized as a plural form by transifex, so only the singular was translated	2016-05-18 10:52:22 +02:00
Olivier Goffart	010649f997	FolderWizard: remove dead code and fix the alias Remove a bunch of dead code. And also set the root folder name properly since alias is gone. Fix the warning: QWizard::field: No such field 'alias'	2016-05-18 10:52:22 +02:00
Jenkins for ownCloud	597f2a4dfc	[tx-robot] updated from transifex	2016-05-18 02:19:16 -04:00
Olivier Goffart	cf1fe690a3	Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set Help to debug https://github.com/owncloud/enterprise/issues/1265	2016-05-17 12:29:20 +02:00
Jenkins for ownCloud	31b27bea38	[tx-robot] updated from transifex	2016-05-17 02:18:59 -04:00
Jenkins for ownCloud	04f99f3bd7	[tx-robot] updated from transifex	2016-05-15 02:19:07 -04:00
Jenkins for ownCloud	fbf92ac239	[tx-robot] updated from transifex	2016-05-14 02:19:15 -04:00
hefee	669a72f0e1	A final release version number breaks this regex (#4835 ) f.ex. a valid verson nr: 2.2.0 -> fist \d+ = 2 -> second \d+ = 2 -> the last \d+ = 0 -> .+ in not matching, because there is nothing to match	2016-05-13 16:55:11 +02:00
Jenkins for ownCloud	2f0e65d37c	[tx-robot] updated from transifex	2016-05-13 02:25:05 -04:00
Olivier Goffart	5676685f58	SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do IL issue 550	2016-05-12 13:15:30 +02:00
Christian Kamm	db9ccb40a4	Fix compile with strict C flags	2016-05-12 13:14:40 +02:00
Christian Kamm	d4c15d2c38	Ignores: expand escapes #4568 (cherry picked from commit `d7bd1300a8`)	2016-05-12 11:53:17 +02:00
Hefee	edb3759684	For tests we do not need a xserver running. Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.	2016-05-12 11:34:21 +02:00
Christian Kamm	0f9c32452c	Protocol: Increase width of timestamp column #4721 Since the font metrics aren't reliable on windows, we add some extra space there.	2016-05-12 10:24:34 +02:00
Daniel Molkentin	45dd1d0acf	Bump to 2.2.1	2016-05-12 09:58:12 +02:00
Daniel Molkentin	552af7b94d	2.2.0 final	2016-05-12 09:58:12 +02:00
Christian Kamm	8934979ba1	timeAgo test: Fix for qt4, clean up	2016-05-12 09:25:15 +02:00
Daniel Molkentin	b3e16e0eb0	Merge pull request #4825 from owncloud/22-user-manual [Doc] 2.2 user manual updates	2016-05-12 08:20:55 +02:00
Carla Schroder	7773380deb	update file manager screenshot	2016-05-11 12:44:27 -07:00
Carla Schroder	e22050a434	updates to 2.2 user manual	2016-05-11 12:37:40 -07:00
Daniel Molkentin	7b0231bfce	Merge pull request #4821 from owncloud/notification_doc Documentation draft to introduce notifications.	2016-05-11 21:16:35 +02:00
Jocelyn Turcotte	edc58c045f	Fix assert on restore after propagation (#4823 ) The assert was there to make sure that this case wasn't happening to eventually be properly tested. Remove the assert for now but this codepath should eventually be unit tested using this specific situation.	2016-05-11 18:16:46 +02:00
Klaas Freitag	035058934f	Documentation draft to introduce notifications. Also added a screenshot.	2016-05-11 11:16:08 +02:00
Klaas Freitag	9b1f46e560	Fix exclude unit test, adopt to new Iface of isExcluded.	2016-05-10 16:46:08 +02:00
Klaas Freitag	9e7a8e619b	Fix utility test: Pass a command name to do the version check.	2016-05-10 16:26:42 +02:00
Klaas Freitag	9c0cd2b13e	Added Changelog for 2.2.0	2016-05-10 15:39:44 +02:00
Daniel Molkentin	58ad781bd4	Update binary submodule	2016-05-10 14:39:22 +02:00
Daniel Molkentin	9d6701ecbe	Windows Shell Integration: Fix another spot where the pipe path was constructed manually	2016-05-10 13:49:14 +02:00
Daniel Molkentin	d659c54798	Update binary sub module	2016-05-10 10:36:49 +02:00
Daniel Molkentin	0e9170cb36	Windows Shell Integration: Unify path lookups	2016-05-10 10:18:53 +02:00
Markus Goetz	8820bc1c17	Windows: Fix Share menu #4781	2016-05-09 14:37:46 +02:00
Jenkins for ownCloud	74f67c97a9	[tx-robot] updated from transifex	2016-05-09 02:19:15 -04:00
Jenkins for ownCloud	fd96b482c5	[tx-robot] updated from transifex	2016-05-07 02:19:16 -04:00
Jocelyn Turcotte	727e73d640	[shell/windows] Fix the windows status push not working (#4784 ) Since the windows implementation first does cache lookups using the path string, directories need to be passed identically as through RETRIEVE_FILE_STATUS. Change the convention to never have a trailing slash for directories in the protocol. This allows the convention to be applied without having to access the disk (since we'd need to know if the path is represented by a directory) and also matches the convention of the rest of the sync engine. Individual file manager plugins are then responsible of handling pushed paths as not ending with a trailing slash. This also: - Moves the trailing slash removal logic from the SyncFileStatusTracker to the SocketApi class - Remove the unneeded QString::normalized call in fileStatus, since this should already be done by the FolderWatcher and plugins	2016-05-06 12:32:01 +02:00