Set version to 2.2.0-rc1

2016-05-10 17:06:04 +02:00
@@ -1,21 +1,15 @@
-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/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 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 apt-key add - < Release.key
 - sudo apt-get update
- sudo apt-get -y build-dep owncloud-client
+- sudo apt-get 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,4 +1,3 @@
-
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.8.0)

@@ -126,17 +125,6 @@ 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()
@@ -1,16 +1,6 @@
 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) 
- * Fix overlay icons for files with umlauts (#4884)
- * Certs: Re-ask for different cert after rejection (#4898, #4911)
- * Progress: Don't count items without propagation jobs (#4856, #4910)
- * Utility: Fix for the translation of minutes, second (#4855)
- * SyncEngine: invalid the blacklist entry when the rename destination change
-
-version 2.2.0 (release 2016-05-12)
+version 2.2.0 (release 2016-05-  )
 * 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)
@@ -15,7 +15,7 @@ with your computer.

 ### Binary packages

-* Refer to the download page https://owncloud.org/install/#install-clients
+* Refer to the download page http://owncloud.org/sync-clients/

 ### Source code

@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 2 )
-set( MIRALL_VERSION_PATCH 3 )
+set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -0,0 +1,5 @@
+--- binary
+++ binary
+@@ -1 +1 @@
+-Subproject commit 1fb9ddfa9a9a1b4dbc447eee10dbed89172d968a
+Subproject commit 01d73965dc8b862d1b2310d3ef801c297b697ec7
@@ -44,18 +44,6 @@
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
-    size_t i = 0;
-
-    // We never want duplicates, so check whether the string is already
-    // in the list first.
-    if (*inList) {
-        for (i = 0; i < (*inList)->count; ++i) {
-            char *pattern = (*inList)->vector[i];
-            if (c_streq(pattern, string)) {
-                return 1;
-            }
-        }
-    }
    return c_strlist_add_grow(inList, string);
 }

@@ -151,10 +139,8 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
        buf[i] = '\0';
        if (*entry != '#') {
          const char *unescaped = csync_exclude_expand_escapes(entry);
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
          rc = _csync_exclude_add(list, unescaped);
-          if( rc == 0 ) {
-              CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
-          }
          SAFE_FREE(unescaped);
          if (rc < 0) {
              goto out;
@@ -472,7 +472,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

                if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
                        || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
-                    csync_file_stat_free(st);
+                    SAFE_FREE(st);
                    continue;
                }

@@ -481,7 +481,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

            /* store into result list. */
            if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_TREE_ERROR;
                break;
            }
@@ -269,8 +269,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    tmp = csync_statedb_get_stat_by_hash(ctx, h);

    if(_last_db_return_error(ctx)) {
-        csync_file_stat_free(st);
-        csync_file_stat_free(tmp);
+        SAFE_FREE(st);
        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
        return -1;
    }
@@ -357,7 +356,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;

        /* tmp might point to malloc mem, so free it here before reusing tmp  */
-        csync_file_stat_free(tmp);
+        SAFE_FREE(tmp);

        /* check if it's a file and has been renamed */
        if (ctx->current == LOCAL_REPLICA) {
@@ -366,7 +365,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);

            if(_last_db_return_error(ctx)) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                return -1;
            }
@@ -422,7 +421,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);

            if(_last_db_return_error(ctx)) {
-                csync_file_stat_free(st);
+                SAFE_FREE(st);
                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
                return -1;
            }
@@ -451,7 +450,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY && ctx->current == REMOTE_REPLICA && ctx->callbacks.checkSelectiveSyncNewFolderHook) {
                    if (ctx->callbacks.checkSelectiveSyncNewFolderHook(ctx->callbacks.update_callback_userdata, path)) {
-                        csync_file_stat_free(st);
+                        SAFE_FREE(st);
                        return 1;
                    }
                }
@@ -461,7 +460,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    }
  } else  {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
-      csync_file_stat_free(st);
+      SAFE_FREE(st);
      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
      return -1;
  }
@@ -523,14 +522,14 @@ out:
  switch (ctx->current) {
    case LOCAL_REPLICA:
      if (c_rbtree_insert(ctx->local.tree, (void *) st) < 0) {
-        csync_file_stat_free(st);
+        SAFE_FREE(st);
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
        return -1;
      }
      break;
    case REMOTE_REPLICA:
      if (c_rbtree_insert(ctx->remote.tree, (void *) st) < 0) {
-        csync_file_stat_free(st);
+        SAFE_FREE(st);
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
        return -1;
      }
@@ -56,7 +56,6 @@ void csync_vio_file_stat_destroy(csync_vio_file_stat_t *file_stat) {
  SAFE_FREE(file_stat->directDownloadUrl);
  SAFE_FREE(file_stat->directDownloadCookies);
  SAFE_FREE(file_stat->name);
-  SAFE_FREE(file_stat->original_name);
  SAFE_FREE(file_stat);
 }

@@ -141,7 +141,7 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
  return file_stat;

 err:
-  csync_vio_file_stat_destroy(file_stat);
+  SAFE_FREE(file_stat);

  return NULL;
 }
@@ -159,8 +159,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your
 1. Assuming you are in the root of the ownCloud Client's source tree, you can
   build an image from this Dockerfile like this::

-    cd admin/win/docker
-    docker build . -t owncloud-client-win32:<version>
+     cd admin/win32/docker
+     docker build . -t ownCloud-client-win32:<version>

   Replace ``<version>`` by the version of the client you are building, e.g.
   |version| for the release of the client that this document describes.
@@ -174,8 +174,8 @@ In order to make setup simple, you can use the provided Dockerfile to build your

 2. From within the source tree Run the docker instance::

-     docker run -v "$PWD:/home/user/client" owncloud-client-win32:<version> \
-        /home/user/client/admin/win/docker/build.sh client/  $(id -u)
+     docker run ownCloud-client-win32:<version> -v "$PWD:/home/jenkins/client" \
+                admin/win32/docker/build.sh $(id -u)

   It will run the build, create an NSIS based installer, as well as run tests.
   You will find the resulting binary in an newly created ``build-win32`` subfolder.
@@ -41,7 +41,7 @@ master_doc = 'index'

 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2013-2016, The ownCloud developers'
+copyright = u'2013, 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-2016, The ownCloud developers'
+epub_copyright = u'2013, 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: 2
+   :maxdepth: 3

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

-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.
-
+.. 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.
+   
 Improvements and New Features
 -----------------------------

-The 2.2 release of the ownCloud desktop sync client has many new features and 
+The 2.1 release of the ownCloud desktop sync client has many new features and 
 improvements. (See the `complete changelog 
 <https://owncloud.org/changelog/desktop/>`_.)
 
-  * 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
+  * 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
  
@@ -62,7 +62,6 @@ 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

@@ -84,7 +83,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 Out**, and **Remove**.
+  **Log In/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 
@@ -94,17 +93,26 @@ 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 (This appears only when your file tree is collapsed, and 
-  expands the file tree)
+* Choose What to Sync
 * Pause Sync / Resume Sync
 * Remove folder sync connection

-**Open Folder** opens your local ownCloud sync folder.
+**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.

 **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 
-Folder Sync Connection**.
+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.

 .. figure:: images/client-7.png
   :alt: Extra options for sync operations
@@ -117,10 +125,12 @@ Folder Sync Connection**.
 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
@@ -165,7 +175,9 @@ 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 Windows Explorer.
+   :alt: Sync client integration in Finder on Mac OS X.
+   
+   *Shared ownCloud files in Finder on Mac OS X*
   
 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 
@@ -194,25 +206,6 @@ 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,218 +11,11 @@ X-GNOME-Autostart-Delay=3


 # Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[oc]=@APPLICATION_EXECUTABLE@
-Comment[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
-GenericName[ar]=مزامنة المجلد
-Name[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
-Icon[ar]=@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[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダ同期
-Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-Icon[ja_JP]=@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[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
-GenericName[bg_BG]=Синхронизиране на папката
-Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
-Icon[bg_BG]=@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[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה
-GenericName[he]=סנכון תיקייה
-Name[he]=@APPLICATION_NAME@ לקוח סנכרון שולחן עבודה 
-Icon[he]=@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[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
-GenericName[is]=Samstilling möppu
-Name[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
-Icon[is]=@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[hu_HU]=@APPLICATION_NAME@ asztali szinkronizációs kliens
-GenericName[hu_HU]=Könyvtár szinkronizálás
-Name[hu_HU]=@APPLICATION_NAME@ asztali szinkr. kliens
-Icon[hu_HU]=@APPLICATION_EXECUTABLE@
-Comment[nl]=@APPLICATION_NAME@ desktop synchronisatie client
-GenericName[nl]=Mappen sync
-Name[nl]=@APPLICATION_NAME@ desktop sync client 
-Icon[nl]=@APPLICATION_EXECUTABLE@
-Icon[pl]=@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[sv]=@APPLICATION_NAME@ desktop synkroniseringsklient
-GenericName[sv]=Mappsynk
-Name[sv]=@APPLICATION_NAME@ desktop synk-klient
-Icon[sv]=@APPLICATION_EXECUTABLE@
-Comment[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
-GenericName[tr]=Dosya Senkronizasyonu
-Name[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
-Icon[tr]=@APPLICATION_EXECUTABLE@
-Comment[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
-GenericName[uk]=Синхронізація теки
-Name[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
-Icon[uk]=@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@
-Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
-GenericName[zh_CN]=文件夹同步
-Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
-Icon[zh_CN]=@APPLICATION_EXECUTABLE@
-GenericName[zh_TW]=資料夾同步
-Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
-GenericName[pt_PT]=Sincronizar Pasta
-Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
-Icon[pt_PT]=@APPLICATION_EXECUTABLE@
-Comment[lb]=@APPLICATION_NAME@ Desktop Synchronisatioun Client
-GenericName[lb]=Dossier Dync
-Name[lb]=@APPLICATION_NAME@ Desktop Sync Client
-Icon[lb]=@APPLICATION_EXECUTABLE@
-Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
-GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
-Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
-Icon[th_TH]=@APPLICATION_EXECUTABLE@
+Comment[nl]=@APPLICATION_NAME@ desktop synchronisatie client
+GenericName[nl]=Mappen sync
+Name[nl]=@APPLICATION_NAME@ desktop sync client 
+Icon[nl]=@APPLICATION_EXECUTABLE@
@@ -28,12 +28,16 @@
 * \return string PEM
 */
 string x509ToString(BIO *o) {
+    int len = 0;
    BUF_MEM *bptr;
+    void* data;
+    string ret = "";
+    
    BIO_get_mem_ptr(o, &bptr);
-    int len = bptr->length;
-    void* data = calloc(len+10, sizeof(char));
+    len = bptr->length;
+    data = calloc(len+10, sizeof(char));
    BIO_read(o, data, len);
-    string ret = std::string(static_cast<char*>(data));
+    ret = strdup((char*)data);
    free(data);
        
    return ret;
@@ -443,27 +443,16 @@ restart_sync:
    QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
    QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));

-
    // Exclude lists
-
-    bool hasUserExcludeFile = !options.exclude.isEmpty();
-    QString systemExcludeFile = ConfigFile::excludeFileFromSystem();
-
-    // Always try to load the user-provided exclude list if one is specified
-    if ( hasUserExcludeFile ) {
+    engine.excludedFiles().addExcludeFilePath(ConfigFile::excludeFileFromSystem());
+    if( QFile::exists(options.exclude) )
        engine.excludedFiles().addExcludeFilePath(options.exclude);
-    }
-    // Load the system list if available, or if there's no user-provided list
-    if ( !hasUserExcludeFile || QFile::exists(systemExcludeFile) ) {
-        engine.excludedFiles().addExcludeFilePath(systemExcludeFile);
-    }
-
    if (!engine.excludedFiles().reloadExcludes()) {
+        // Always make sure at least one list has been loaded
        qFatal("Cannot load system exclude list or list supplied via --exclude");
        return EXIT_FAILURE;
    }

-
    // Have to be done async, else, an error before exec() does not terminate the event loop.
    QMetaObject::invokeMethod(&engine, "startSync", Qt::QueuedConnection);

@@ -159,13 +159,7 @@ void AccountSettings::createAccountToolbox()

 void AccountSettings::slotOpenAccountWizard()
 {
-    if (
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
-            qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" ||
-                // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
-                // (issue #4693, #4944)
-#endif
-            QSystemTrayIcon::isSystemTrayAvailable()) {
+    if (QSystemTrayIcon::isSystemTrayAvailable()) {
        topLevelWidget()->close();
    }
 #ifdef Q_OS_MAC
@@ -190,8 +190,7 @@ void AccountState::checkConnectivity()
    } else {
        // Check the server and then the auth.

-// Let's try this for all OS and see if it fixes the Qt issues we have on Linux  #4720 #3888 #4051
-//#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN
        // There seems to be a bug in Qt on Windows where QNAM sometimes stops
        // working correctly after the computer woke up from sleep. See #2895 #2899
        // and #2973.
@@ -202,7 +201,7 @@ void AccountState::checkConnectivity()
        // If we don't reset the ssl config a second CheckServerJob can produce a
        // ssl config that does not have a sensible certificate chain.
        account()->setSslConfiguration(QSslConfiguration());
-//#endif
+#endif
        conValidator->checkServerAndAuth();
    }
 }
@@ -210,7 +209,6 @@ void AccountState::checkConnectivity()
 void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList& errors)
 {
    if (isSignedOut()) {
-        qDebug() << "Signed out, ignoring" << connectionStatusString(status) << _account->url().toString();
        return;
    }

@@ -139,7 +139,6 @@ Application::Application(int &argc, char **argv) :
    setupTranslations();

    // Setup global excludes
-    qDebug() << "Loading global exclude list";
    ConfigFile cfg;
    ExcludedFiles& excludes = ExcludedFiles::instance();
    excludes.addExcludeFilePath( cfg.excludeFile(ConfigFile::SystemScope) );
@@ -336,14 +335,6 @@ void Application::slotownCloudWizardDone( int res )
    }
 }

-static void csyncLogCatcher(int /*verbosity*/,
-                        const char */*function*/,
-                        const char *buffer,
-                        void */*userdata*/)
-{
-    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
-}
-
 void Application::setupLogging()
 {
    // might be called from second instance
@@ -359,9 +350,6 @@ void Application::setupLogging()
                .arg(property("ui_lang").toString())
                .arg(_theme->version());

-    // Setup CSYNC logging to forward to our own logger
-    csync_set_log_callback( csyncLogCatcher );
-    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );
 }

 void Application::slotUseMonoIconsChanged(bool)
@@ -38,12 +38,7 @@ namespace OCC

 class UserAgentWebPage : public QWebPage {
 public:
-    UserAgentWebPage(QObject *parent) : QWebPage(parent)
-    {
-        if (!qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty()) {
-            settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-        }
-    }
+    UserAgentWebPage(QObject *parent) : QWebPage(parent) {}
    QString userAgentForUrl(const QUrl &url ) const {
        return QWebPage::userAgentForUrl(url) + " " + Utility::userAgentString();
    }
@@ -46,6 +46,14 @@

 namespace OCC {

+static void csyncLogCatcher(int /*verbosity*/,
+                        const char */*function*/,
+                        const char *buffer,
+                        void */*userdata*/)
+{
+    Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
+}
+

 Folder::Folder(const FolderDefinition& definition,
               AccountState* accountState,
@@ -113,8 +121,6 @@ Folder::Folder(const FolderDefinition& definition,

 Folder::~Folder()
 {
-    // Reset then engine first as it will abort and try to access members of the Folder
-    _engine.reset();
 }

 void Folder::checkLocalPath()
@@ -314,7 +320,6 @@ void Folder::slotRunEtagJob()
        // sync if it's different.

        _requestEtagJob = new RequestEtagJob(account, remotePath(), this);
-        _requestEtagJob->setTimeout(60*1000);
        // check if the etag is different
        QObject::connect(_requestEtagJob, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
        FolderMan::instance()->slotScheduleETagJob(alias(), _requestEtagJob);
@@ -573,10 +578,19 @@ int Folder::slotWipeErrorBlacklist()

 void Folder::slotWatchedPathChanged(const QString& path)
 {
+    // When no sync is running or it's in the prepare phase, we can
+    // always schedule a new sync.
+    if (! _engine->isSyncRunning() || _syncResult.status() == SyncResult::SyncPrepare) {
+        emit watchedFileChangedExternally(path);
+        emit scheduleToSync(this);
+        return;
+    }
+
    // The folder watcher fires a lot of bogus notifications during
    // a sync operation, both for actual user files and the database
    // and log. Therefore we check notifications against operations
    // the sync is doing to filter out our own changes.
+    bool ownChange = false;
 #ifdef Q_OS_MAC
    Q_UNUSED(path)
    // On OSX the folder watcher does not report changes done by our
@@ -586,23 +600,14 @@ void Folder::slotWatchedPathChanged(const QString& path)
    const auto maxNotificationDelay = 15*1000;
    qint64 time = _engine->timeSinceFileTouched(path);
    if (time != -1 && time < maxNotificationDelay) {
-        return;
+        ownChange = true;
    }
 #endif

-    // Check that the mtime actually changed.
-    if (path.startsWith(this->path())) {
-        auto relativePath = path.mid(this->path().size());
-        auto record = _journal.getFileRecord(relativePath);
-        if (record.isValid() && !FileSystem::fileChanged(path, record._fileSize,
-                Utility::qDateTimeToTime_t(record._modtime))) {
-            qDebug() << "Ignoring spurious notification for file" << relativePath;
-            return;  // probably a spurious notification
-        }
+    if (! ownChange) {
+        emit watchedFileChangedExternally(path);
+        emit scheduleToSync(this);
    }
-
-    emit watchedFileChangedExternally(path);
-    emit scheduleToSync(this);
 }

 void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
@@ -625,7 +630,7 @@ void Folder::removeFromSettings() const
 {
    auto  settings = _accountState->settings();
    settings->beginGroup(QLatin1String("Folders"));
-    settings->remove(FolderMan::escapeAlias(_definition.alias));
+    settings->remove(_definition.alias);
 }

 bool Folder::isFileExcludedAbsolute(const QString& fullPath) const
@@ -689,10 +694,6 @@ void Folder::wipe()

 bool Folder::setIgnoredFiles()
 {
-    // Note: Doing this on each sync run and on Folder construction is
-    // unnecessary, because _engine->excludedFiles() persists between
-    // sync runs. This is not a big problem because ExcludedFiles maintains
-    // a QSet of files to load.
    ConfigFile cfg;
    QString systemList = cfg.excludeFile(ConfigFile::SystemScope);
    if( QFile::exists(systemList) ) {
@@ -724,6 +725,8 @@ void Folder::startSync(const QStringList &pathList)
    if (proxyDirty()) {
        setProxyDirty(false);
    }
+    csync_set_log_callback( csyncLogCatcher );
+    csync_set_log_level( Logger::instance()->isNoop() ? 0 : 11 );

    if (isBusy()) {
        qCritical() << "* ERROR csync is still running and new sync requested.";
@@ -912,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.isUpdatingEstimates() ) {
+    if( !pi.hasStarted() ) {
        // this is the beginning of a sync, set the warning level to 0
        _syncResult.setWarnCount(0);
    }
@@ -51,14 +51,6 @@ static void callback(
    Q_UNUSED(eventFlags)
    Q_UNUSED(eventIds)

-    const FSEventStreamEventFlags c_interestingFlags
-            = kFSEventStreamEventFlagItemCreated // for new folder/file
-            | kFSEventStreamEventFlagItemRemoved // for rm
-            | kFSEventStreamEventFlagItemInodeMetaMod // for mtime change
-            | kFSEventStreamEventFlagItemRenamed // also coming for moves to trash in finder
-            | kFSEventStreamEventFlagItemModified; // for content change
-    //We ignore other flags, e.g. for owner change, xattr change, Finder label change etc
-
    qDebug() << "FolderWatcherPrivate::callback by OS X";

    QStringList paths;
@@ -70,14 +62,8 @@ static void callback(
        CFIndex pathLength = CFStringGetLength(path);
        qstring.resize(pathLength);
        CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));
-        QString fn = qstring.normalized(QString::NormalizationForm_C);

-        if (!(eventFlags[i] & c_interestingFlags)) {
-            qDebug() << "Ignoring non-content changes for" << fn;
-            continue;
-        }
-
-        paths.append(fn);
+        paths.append(qstring.normalized(QString::NormalizationForm_C));
    }

    reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);
@@ -68,6 +68,13 @@ 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();
 }
@@ -128,6 +135,14 @@ 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();
 }
@@ -488,13 +503,11 @@ 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();
 }
@@ -507,10 +520,8 @@ 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();
 }
@@ -161,4 +161,12 @@ void GeneralSettings::slotIgnoreFilesEditor()
    }
 }

+void GeneralSettings::slotOpenAccountWizard()
+{
+    if (QSystemTrayIcon::isSystemTrayAvailable()) {
+        topLevelWidget()->close();
+    }
+    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
+}
+
 } // namespace OCC
@@ -44,6 +44,7 @@ private slots:
    void slotToggleOptionalDesktopNotifications(bool);
    void slotUpdateInfo();
    void slotIgnoreFilesEditor();
+    void slotOpenAccountWizard();

 private:
    void loadMiscSettings();
@@ -47,21 +47,18 @@ int main(int argc, char **argv)
 {
    Q_INIT_RESOURCE(client);

-#ifdef Q_OS_WIN
+#ifndef Q_OS_MAC
    // If the font size ratio is set on Windows, we need to
    // enable the auto pixelRatio in Qt since we don't
    // want to use sizes relative to the font size everywhere.
    // This is automatic on OS X, but opt-in on Windows and Linux
    // https://doc-snapshots.qt.io/qt5-5.6/highdpi.html#qt-support
-    // We do not define it on linux so the behaviour is kept the same
-    // as other Qt apps in the desktop environment. (which may or may
-    // not set this envoronment variable)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+    qputenv("QT_DEVICE_PIXEL_RATIO", "auto");
 #else
-    qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); // See #4840, #4994
+    qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
 #endif
-#endif // !Q_OS_WIN
+#endif // !Q_OS_MAC

 #ifdef Q_OS_MAC
    Mac::CocoaInitializer cocoaInit; // RIIA
@@ -685,7 +685,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
        slotRebuildRecentMenus();
    }

-    if (progress.isUpdatingEstimates()
+    if (progress.hasStarted()
            && progress.completedFiles() >= progress.totalFiles()
            && progress._currentDiscoveredFolder.isEmpty()) {
        QTimer::singleShot(2000, this, SLOT(slotDisplayIdle()));
@@ -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()->resetRejectedCertificates();
+    _ocWizard->account()->resetSslCertErrorState();
 }

 void OwncloudSetupWizard::slotNoOwnCloudFoundAuthTimeout(const QUrl&url)
@@ -57,15 +57,9 @@ 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()))
-        + timestampColumnExtra;
+        _ui->_treeWidget->fontMetrics().width(timeString(QDateTime::currentDateTime()));
    _ui->_treeWidget->setColumnWidth(0, timestampColumnWidth);
    _ui->_treeWidget->setColumnWidth(1, 180);
    _ui->_treeWidget->setColumnCount(5);
@@ -90,8 +84,7 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
    _issueItemView->setHeaderLabels( header );
    timestampColumnWidth =
            ActivityItemDelegate::rowHeight() // icon
-            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()))
-            + timestampColumnExtra;
+            + _issueItemView->fontMetrics().width(timeString(QDateTime::currentDateTime()));
    _issueItemView->setColumnWidth(0, timestampColumnWidth);
    _issueItemView->setColumnWidth(1, 180);
    _issueItemView->setColumnCount(4);
@@ -121,9 +114,17 @@ void ProtocolWidget::hideEvent(QHideEvent *ev)

 void ProtocolWidget::cleanItems(const QString& folder)
 {
+    int itemCnt = _ui->_treeWidget->topLevelItemCount();
+
+    // Limit the number of items
+    while(itemCnt > 2000) {
+        delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
+        itemCnt--;
+    }
+
    // The issue list is a state, clear it and let the next sync fill it
    // with ignored files and propagation errors.
-    int itemCnt = _issueItemView->topLevelItemCount();
+    itemCnt = _issueItemView->topLevelItemCount();
    for( int cnt = itemCnt-1; cnt >=0 ; cnt-- ) {
        QTreeWidgetItem *item = _issueItemView->topLevelItem(cnt);
        QString itemFolder = item->data(2, Qt::UserRole).toString();
@@ -211,7 +212,7 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo

 void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo& progress )
 {
-    if( !progress.isUpdatingEstimates() ) {
+    if( !progress.hasStarted() ) {
        // The sync is restarting, clean the old items
        cleanItems(folder);
    } else if (progress.completedFiles() >= progress.totalFiles()) {
@@ -231,12 +232,6 @@ void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem
            _issueItemView->insertTopLevelItem(0, line);
            emit issueItemCountUpdated(_issueItemView->topLevelItemCount());
        } else {
-            // Limit the number of items
-            int itemCnt = _ui->_treeWidget->topLevelItemCount();
-            while(itemCnt > 2000) {
-                delete _ui->_treeWidget->takeTopLevelItem(itemCnt - 1);
-                itemCnt--;
-            }
            _ui->_treeWidget->insertTopLevelItem(0, line);
        }
    }
@@ -72,7 +72,9 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,

    _completer->setModel(_completerModel);
    _completer->setCaseSensitivity(Qt::CaseInsensitive);
-    _completer->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
+    _completer->setFilterMode(Qt::MatchContains);
+#endif
    _ui->shareeLineEdit->setCompleter(_completer);

    _manager = new ShareManager(_account, this);
@@ -218,7 +218,6 @@ void OCUpdater::slotVersionInfoArrived()
 {
    _timeoutWatchdog->stop();
    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
-    reply->deleteLater();
    if( reply->error() != QNetworkReply::NoError ) {
        qDebug() << "Failed to reach version check url: " << reply->errorString();
        return;
@@ -259,7 +258,6 @@ void NSISUpdater::slotWriteFile()
 void NSISUpdater::slotDownloadFinished()
 {
    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
-    reply->deleteLater();
    if (reply->error() != QNetworkReply::NoError) {
        setDownloadState(DownloadFailed);
        return;
@@ -242,7 +242,6 @@ void AbstractNetworkJob::slotTimeout()
        reply()->abort();
    } else {
        qDebug() << Q_FUNC_INFO << this << "Timeout reply was NULL";
-        deleteLater();
    }
 }

@@ -38,6 +38,9 @@ namespace OCC {
 Account::Account(QObject *parent)
    : QObject(parent)
    , _capabilities(QVariantMap())
+    , _am(0)
+    , _credentials(0)
+    , _treatSslErrorsAsFailure(false)
    , _davPath( Theme::instance()->webDavPath() )
    , _wasMigrated(false)
 {
@@ -53,6 +56,8 @@ AccountPtr Account::create()

 Account::~Account()
 {
+    delete _credentials;
+    delete _am;
 }

 QString Account::davPath() const
@@ -113,14 +118,14 @@ bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const
        changes = (_url == other->_url);
    }

-    changes |= _credentials->changed(other->credentials());
+    changes |= _credentials->changed(other->_credentials);

    return changes;
 }

 AbstractCredentials *Account::credentials() const
 {
-    return _credentials.data();
+    return _credentials;
 }

 void Account::setCredentials(AbstractCredentials *cred)
@@ -131,27 +136,29 @@ void Account::setCredentials(AbstractCredentials *cred)
        jar = _am->cookieJar();
        jar->setParent(0);

-        _am = QSharedPointer<QNetworkAccessManager>();
+        _am->deleteLater();
+    }
+
+    if (_credentials) {
+        credentials()->deleteLater();
    }

    // The order for these two is important! Reading the credential's
-    // settings accesses the account as well as account->_credentials,
-    // so deleteLater must be used.
-    _credentials = QSharedPointer<AbstractCredentials>(cred, &QObject::deleteLater);
+    // settings accesses the account as well as account->_credentials
+    _credentials = cred;
    cred->setAccount(this);

-    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
-
+    _am = _credentials->getQNAM();
    if (jar) {
        _am->setCookieJar(jar);
    }
-    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
            SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
            SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
-    connect(_credentials.data(), SIGNAL(fetched()),
+    connect(_credentials, SIGNAL(fetched()),
            SLOT(slotCredentialsFetched()));
-    connect(_credentials.data(), SIGNAL(asked()),
+    connect(_credentials, SIGNAL(asked()),
            SLOT(slotCredentialsAsked()));
 }

@@ -190,21 +197,18 @@ void Account::resetNetworkAccessManager()

    qDebug() << "Resetting QNAM";
    QNetworkCookieJar* jar = _am->cookieJar();
-
-    // Use a QSharedPointer to allow locking the life of the QNAM on the stack.
-    // Make it call deleteLater to make sure that we can return to any QNAM stack frames safely.
-    _am = QSharedPointer<QNetworkAccessManager>(_credentials->getQNAM(), &QObject::deleteLater);
-
+    _am->deleteLater();
+    _am = _credentials->getQNAM();
    _am->setCookieJar(jar); // takes ownership of the old cookie jar
-    connect(_am.data(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+    connect(_am, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
            SLOT(slotHandleSslErrors(QNetworkReply*,QList<QSslError>)));
-    connect(_am.data(), SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+    connect(_am, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
            SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 }

 QNetworkAccessManager *Account::networkAccessManager()
 {
-    return _am.data();
+    return _am;
 }

 QNetworkReply *Account::headRequest(const QString &relPath)
@@ -325,9 +329,9 @@ void Account::addApprovedCerts(const QList<QSslCertificate> certs)
    _approvedCerts += certs;
 }

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

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

-    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 ) {
+    if( _treatSslErrorsAsFailure ) {
+        // User decided once not to trust. Honor this decision.
        qDebug() << out << "Certs not trusted by user decision, returning.";
        return;
    }
@@ -427,12 +424,6 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
        return;
    }

-    // SslDialogErrorHandler::handleErrors will run an event loop that might execute
-    // the deleteLater() of the QNAM before we have the chance of unwinding our stack.
-    // Keep a ref here on our stackframe to make sure that it doesn't get deleted before
-    // handleErrors returns.
-    QSharedPointer<QNetworkAccessManager> qnamLock = _am;
-
    if (_sslErrorHandler->handleErrors(errors, reply->sslConfiguration(), &approvedCerts, sharedFromThis())) {
        QSslSocket::addDefaultCaCertificates(approvedCerts);
        addApprovedCerts(approvedCerts);
@@ -445,12 +436,7 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors
        // certificate changes.
        reply->ignoreSslErrors(errors);
    } else {
-        // 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());
-            }
-        }
+        _treatSslErrorsAsFailure = true;
        // 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
@@ -462,12 +448,12 @@ void Account::slotHandleSslErrors(QNetworkReply *reply , QList<QSslError> errors

 void Account::slotCredentialsFetched()
 {
-    emit credentialsFetched(_credentials.data());
+    emit credentialsFetched(_credentials);
 }

 void Account::slotCredentialsAsked()
 {
-    emit credentialsAsked(_credentials.data());
+    emit credentialsAsked(_credentials);
 }

 void Account::handleInvalidCredentials()
@@ -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 resetRejectedCertificates();
+    void resetSslCertErrorState();

    // pluggable handler
    void setSslErrorHandler(AbstractSslErrorHandler *handler);
@@ -214,12 +214,9 @@ private:
    QString _serverVersion;
    QScopedPointer<AbstractSslErrorHandler> _sslErrorHandler;
    QuotaInfo *_quotaInfo;
-    QSharedPointer<QNetworkAccessManager> _am;
-    QSharedPointer<AbstractCredentials> _credentials;
-
-    /// Certificates that were explicitly rejected by the user
-    QList<QSslCertificate> _rejectedCertificates;
-
+    QNetworkAccessManager *_am;
+    AbstractCredentials* _credentials;
+    bool _treatSslErrorsAsFailure;
    static QString _configFileName;
    QByteArray _pemCertificate; 
    QString _pemPrivateKey;  
@@ -42,7 +42,7 @@ ExcludedFiles& ExcludedFiles::instance()

 void ExcludedFiles::addExcludeFilePath(const QString& path)
 {
-    _excludeFiles.insert(path);
+    _excludeFiles.append(path);
 }

 bool ExcludedFiles::reloadExcludes()
@@ -16,8 +16,7 @@
 #include "owncloudlib.h"

 #include <QObject>
-#include <QSet>
-#include <QString>
+#include <QStringList>

 extern "C" {
 #include "std/c_string.h"
@@ -67,7 +66,7 @@ private:
    // This is a pointer to the csync exclude list, its is owned by this class
    // but the pointer can be in a csync_context so that it can itself also query the list.
    c_strlist_t** _excludesPtr;
-    QSet<QString> _excludeFiles;
+    QStringList _excludeFiles;
 };

 } // namespace OCC
@@ -496,16 +496,16 @@ QString FileSystem::fileSystemForPath(const QString & path)
 }
 #endif

-#define BUFSIZE qint64(500*1024)  // 500 KiB
+#define BUFSIZE 1024*1024*10

 static QByteArray readToCrypto( const QString& filename, QCryptographicHash::Algorithm algo )
 {
-    QFile file(filename);
-    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
-    QByteArray buf(bufSize, Qt::Uninitialized);
+    const qint64 bufSize = BUFSIZE;
+    QByteArray buf(bufSize,0);
    QByteArray arr;
    QCryptographicHash crypto( algo );

+    QFile file(filename);
    if (file.open(QIODevice::ReadOnly)) {
        qint64 size;
        while (!file.atEnd()) {
@@ -532,11 +532,11 @@ QByteArray FileSystem::calcSha1( const QString& filename )
 #ifdef ZLIB_FOUND
 QByteArray FileSystem::calcAdler32( const QString& filename )
 {
-    QFile file(filename);
-    const qint64 bufSize = qMin(BUFSIZE, file.size() + 1);
-    QByteArray buf(bufSize, Qt::Uninitialized);
-
    unsigned int adler = adler32(0L, Z_NULL, 0);
+    const qint64 bufSize = BUFSIZE;
+    QByteArray buf(bufSize, 0);
+
+    QFile file(filename);
    if (file.open(QIODevice::ReadOnly)) {
        qint64 size;
        while (!file.atEnd()) {
@@ -111,9 +111,9 @@ bool OWNCLOUDSYNC_EXPORT rename(const QString& originFileName,
 *
 * @return true if the file's mtime or size are not what is expected.
 */
-bool OWNCLOUDSYNC_EXPORT fileChanged(const QString& fileName,
-                                     qint64 previousSize,
-                                     time_t previousMtime);
+bool fileChanged(const QString& fileName,
+                 qint64 previousSize,
+                 time_t previousMtime);

 /**
 * @brief Like !fileChanged() but with verbose logging if the file *did* change.
@@ -297,12 +297,7 @@ public:

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

-    /** 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)
-     */
+    /* The list of currently active jobs */
    QList<PropagateItemJob*> _activeJobList;

    /** We detected that another sync is required after this one */
@@ -388,7 +383,6 @@ private:
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    // access to signals which are protected in Qt4
    friend class PropagateDownloadFileQNAM;
-    friend class PropagateUploadFileQNAM;
 #endif
 };

@@ -127,65 +127,27 @@ void ProgressDispatcher::setProgressInfo(const QString& folder, const ProgressIn
    emit progressInfo( folder, progress );
 }

-ProgressInfo::ProgressInfo()
+void ProgressInfo::start()
 {
    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::isUpdatingEstimates() const
+bool ProgressInfo::hasStarted() 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 (!shouldCountProgress(item)) {
-        return;
-    }
-
-    _fileProgress._total += item._affectedItems;
-    if (isSizeDependent(item)) {
-        _sizeProgress._total += item._size;
+    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++;
    }
 }

@@ -216,10 +178,6 @@ 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)) {
@@ -231,10 +189,6 @@ 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();
-
-    /** Resets for a new sync run.
-     */
-    void reset();
+    ProgressInfo()
+        : _totalSizeOfCompletedJobs(0)
+        , _maxFilesPerSecond(2.0)
+        , _maxBytesPerSecond(100000.0)
+    {}

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

    /**
-     * Returns true when startEstimateUpdates() was called.
+     * Returns true when propagation has started (start() 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 isUpdatingEstimates() == false.
+     * first ProgressInfo will have hasStarted() == false.
     */
-    bool isUpdatingEstimates() const;
+    bool hasStarted() const;

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

+
 void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
 {
    const auto theContentChecksumType = contentChecksumType();
@@ -97,9 +97,7 @@ void PUTFileJob::start() {
 }

 void PUTFileJob::slotTimeout() {
-    qDebug() << "Timeout" << (reply() ? reply()->request().url() : path());
-    if (!reply())
-        return;
+    qDebug() << "Timeout" << reply()->request().url();
    _errorString =  tr("Connection Timeout");
    reply()->abort();
 }
@@ -211,6 +209,8 @@ 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
@@ -234,8 +234,6 @@ void PropagateUploadFileQNAM::slotComputeContentChecksum()

    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
            SLOT(slotComputeTransmissionChecksum(QByteArray,QByteArray)));
-    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
-            computeChecksum, SLOT(deleteLater()));
    computeChecksum->start(filePath);
 }

@@ -270,18 +268,12 @@ void PropagateUploadFileQNAM::slotComputeTransmissionChecksum(const QByteArray&

    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
            SLOT(slotStartUpload(QByteArray,QByteArray)));
-    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
-            computeChecksum, SLOT(deleteLater()));
    const QString filePath = _propagator->getFilePath(_item->_file);
    computeChecksum->start(filePath);
 }

 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;

@@ -406,7 +398,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;
@@ -552,16 +544,8 @@ void PropagateUploadFileQNAM::startNextChunk()
                _transmissionChecksumType, _transmissionChecksum);
    }

-    const QString fileName = _propagator->getFilePath(_item->_file);
-    if (! device->prepareAndOpen(fileName, chunkStart, currentChunkSize)) {
+    if (! device->prepareAndOpen(_propagator->getFilePath(_item->_file), 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;
@@ -779,8 +763,6 @@ void PropagateUploadFileQNAM::slotPutFinished()
             << _stopWatch.durationOfLap(QLatin1String("ContentChecksum"))
             << _stopWatch.durationOfLap(QLatin1String("TransmissionChecksum"))
             << _item->_requestDuration;
-    // The job might stay alive for the whole sync, release this tiny bit of memory.
-    _stopWatch.reset();

    finalize(*_item);
 }
@@ -101,10 +101,10 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
 SyncEngine::~SyncEngine()
 {
    abort();
-    _thread.quit();
-    _thread.wait();
    _excludedFiles.reset();
    csync_destroy(_csync_ctx);
+    _thread.quit();
+    _thread.wait();
 }

 //Convert an error code from csync to a user readable string.
@@ -203,12 +203,6 @@ 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 ) {
@@ -240,9 +234,6 @@ 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.
@@ -548,10 +539,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);
@@ -580,7 +571,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 (!isDirectory) {
+        } else if (!item->_isDirectory) {
            if (std::difftime(file->modtime, file->other.modtime) < 0) {
                // We are going back on time
                _backInTimeFiles++;
@@ -682,8 +673,6 @@ 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.");
@@ -920,7 +909,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->startEstimateUpdates();
+    _progressInfo->start();

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

-#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) {
+#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) {
                    // 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) {
@@ -1379,13 +1365,13 @@ AccountPtr SyncEngine::account() const

 void SyncEngine::abort()
 {
-    // Sets a flag for the update phase
-    csync_request_abort(_csync_ctx);
    qDebug() << Q_FUNC_INFO << _discoveryMainThread;
    // Aborts the discovery phase job
    if (_discoveryMainThread) {
        _discoveryMainThread->abort();
    }
+    // Sets a flag for the update phase
+    csync_request_abort(_csync_ctx);
    // For the propagator
    if(_propagator) {
        _propagator->abort();
@@ -76,6 +76,7 @@ SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine)
            SLOT(slotAboutToPropagate(SyncFileItemVector&)));
    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItem&, const PropagatorJob&)),
            SLOT(slotItemCompleted(const SyncFileItem&)));
+    connect(syncEngine, SIGNAL(started()), SLOT(slotClearDirtyPaths()));
    connect(syncEngine, SIGNAL(started()), SLOT(slotSyncEngineRunningChanged()));
    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncEngineRunningChanged()));
 }
@@ -93,11 +94,9 @@ SyncFileItem SyncFileStatusTracker::rootSyncFileItem()

 SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
 {
-    // normalization is required for OS X to match file names properly
-    QString normalizedRelativePath = relativePath.normalized(QString::NormalizationForm_C);
-    Q_ASSERT(!normalizedRelativePath.endsWith(QLatin1Char('/')));
+    Q_ASSERT(!relativePath.endsWith(QLatin1Char('/')));

-    if (normalizedRelativePath.isEmpty()) {
+    if (relativePath.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());
    }
@@ -108,22 +107,22 @@ SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
    // 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() + normalizedRelativePath,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + relativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

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

-    SyncFileItem* item = _syncEngine->findSyncItem(normalizedRelativePath);
+    SyncFileItem* item = _syncEngine->findSyncItem(relativePath);
    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(normalizedRelativePath);
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(relativePath);
    if (rec.isValid()) {
        return syncFileItemStatus(rec.toSyncFileItem());
    }
@@ -155,18 +154,9 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
        } else if (showWarningInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
        }
-        _dirtyPaths.remove(item->destination());
        emit fileStatusChanged(getSystemDestination(item->destination()), syncFileItemStatus(*item));
    }

-    // Some metadata status won't trigger files to be synced, make sure that we
-    // push the OK status for dirty files that don't need to be propagated.
-    // Swap into a copy since fileStatus() reads _dirtyPaths to determine the status
-    QSet<QString> oldDirtyPaths;
-    std::swap(_dirtyPaths, oldDirtyPaths);
-    for (auto it = oldDirtyPaths.begin(); it != oldDirtyPaths.end(); ++it)
-        emit fileStatusChanged(getSystemDestination(*it), fileStatus(*it));
-
    // Make sure to push any status that might have been resolved indirectly since the last sync
    // (like an error file being deleted from disk)
    for (auto it = _syncProblems.begin(); it != _syncProblems.end(); ++it)
@@ -190,7 +180,8 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
    } else if (showWarningInSocketApi(item)) {
        _syncProblems[item._file] = SyncFileStatus::StatusWarning;
    } else {
-        _syncProblems.erase(item._file);
+        // 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());
    }

    emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));
@@ -201,6 +192,13 @@ void SyncFileStatusTracker::slotSyncEngineRunningChanged()
    emit fileStatusChanged(_syncEngine->localPath(), syncFileItemStatus(rootSyncFileItem()));
 }

+void SyncFileStatusTracker::slotClearDirtyPaths()
+{
+    // We just assume that during a sync all dirty statuses will be resolved
+    // one way or the other.
+    _dirtyPaths.clear();
+}
+
 SyncFileStatus SyncFileStatusTracker::syncFileItemStatus(const SyncFileItem& item)
 {
    // Hack to know if the item was taken from the sync engine (Sync), or from the database (UpToDate)
@@ -47,6 +47,7 @@ private slots:
    void slotAboutToPropagate(SyncFileItemVector& items);
    void slotItemCompleted(const SyncFileItem& item);
    void slotSyncEngineRunningChanged();
+    void slotClearDirtyPaths();

 private:
    SyncFileStatus syncFileItemStatus(const SyncFileItem& item);
@@ -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, renameTarget "
+    QString sql( "SELECT lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration "
                 "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, renameTarget) "
-                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)");
+                                "(path, lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration) "
+                                "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7)");

    _getSelectiveSyncListQuery.reset(new SqlQuery(_db));
    _getSelectiveSyncListQuery->prepare("SELECT path FROM selectivesync WHERE type=?1");
@@ -612,15 +612,6 @@ 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);");
@@ -1233,7 +1224,6 @@ 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();
@@ -1345,14 +1335,13 @@ 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._renameTarget ;
+             << item._lastTryModtime << item._lastTryEtag;
    _setErrorBlacklistQuery->reset_and_clear_bindings();

 }
@@ -151,7 +151,6 @@ 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,7 +89,6 @@ public:
    time_t     _ignoreDuration;

    QString    _file;
-    QString    _renameTarget;

    bool isValid() const;

@@ -306,22 +306,17 @@ namespace {
        QString description(quint64 value) const
        {
            return QCoreApplication::translate(
-                    "Utility", name, 0, QCoreApplication::UnicodeUTF8,
+                    "Utiliy", 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", "%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 },
+        { 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 },
        { 0, 0 }
    };
 } // anonymous namespace
@@ -20,7 +20,7 @@
 #include <QByteArray>
 #include <QDateTime>
 #include <QElapsedTimer>
-#include <QMap>
+#include <QHash>

 namespace OCC {

@@ -121,7 +121,7 @@ namespace Utility

    class OWNCLOUDSYNC_EXPORT StopWatch {
    private:
-        QMap<QString, quint64> _lapTimes;
+        QHash<QString, quint64> _lapTimes;
        QDateTime _startTime;
        QElapsedTimer _timer;
    public:
@@ -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)
+    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)

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

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

 };

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

 };

-QTEST_APPLESS_MAIN(TestCSyncSqlite)
+QTEST_MAIN(TestCSyncSqlite)
 #include "testcsyncsqlite.moc"
@@ -46,5 +46,5 @@ private slots:
    }
 };

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

 };

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

 };

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

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

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

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

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

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

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

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

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

 };

-QTEST_APPLESS_MAIN(TestUpdater)
+QTEST_MAIN(TestUpdater)
 #include "testupdater.moc"
@@ -127,7 +127,7 @@ private slots:
 	    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());
@@ -136,29 +136,36 @@ private slots:

    void testTimeAgo()
    {
-        // Both times in same timezone
+        // Both times in local time
        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);
-        QDateTime laterTS = QDateTime::fromString("2015-01-24T09:20:30-01:00", Qt::ISODate);
+        earlyTS.setTimeSpec(Qt::UTC);
+        QDateTime laterTS = earlyTS.toOffsetFromUtc(3600);
+        laterTS.setTimeSpec(Qt::UTC);
        s = timeAgoInWords(earlyTS, laterTS);
-        QCOMPARE(s, QLatin1String("2 hour(s) ago"));
+        QCOMPARE(s, QLatin1String("1 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_APPLESS_MAIN(TestUtility)
+QTEST_MAIN(TestUtility)
 #include "testutility.moc"
@@ -441,10 +441,5 @@ private slots:

 };

-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    QTEST_MAIN(TestXmlParse)
-#else
-    QTEST_GUILESS_MAIN(TestXmlParse)
-#endif
-
+QTEST_MAIN(TestXmlParse)
 #include "testxmlparse.moc"
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Abbrechen</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Benutzerkonto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Zu synchronisierende Elemente auswählen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Ordner Synchronisation entfernen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Ordner anlegen fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Konnte lokalen Ordner &lt;i&gt;%1&lt;/i&gt; nicht anlegen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Bestätigen Sie die Löschung der Ordner Sychronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Ordner Synchronisation entfernen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Synchronisation läuft</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Die Synchronisation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 wird verwendet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>Die Serververision %1 ist al und nicht unterstützt! Fortfahren auf eigenes Risiko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Verbunden mit %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Server %1 ist derzeit nicht verfügbar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Abgemeldet von %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Keine Verbindung zu %1 auf %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Einloggen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Einige neue Ordner konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Konto wirklich entfernen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Wollen Sie wirklich die Verbindung zum Konto &lt;i&gt;%1&lt;/i&gt; lösen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dieser Vorgang wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Verbindung entfernen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Ordner öffnen</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Abmelden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Synchronisation fortsetzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Synchronisation pausieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Möchten Sie wirklich die Synchronisation des Ordners &lt;i&gt;%1&lt;/i&gt; stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte ordner können unterschiedliche Beschränkungen aufweisen. </translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 von %2 Serverkapazität verwendet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Keine %1-Verbindung konfiguriert.</translation>
    </message>
@@ -579,118 +579,118 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokales Verzeichnis %1 existiert nicht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 ist nicht lesbar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde heruntergeladen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 wurde aktualisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 wurde in %2 umbenannt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 wurde in %2 verschoben.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Synchronisierungsaktivität</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -699,22 +699,22 @@ Die Ursache ist, dass der Ordner entweder neu konfiguriert wurde, oder weil alle
 Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Alle Dateien löschen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Lösche alle Dateien</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Dateien behalten</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -723,17 +723,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt
 Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Backup erkannt</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normale Synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Lokale Konfliktdateien behalten</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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Entfernten Ordner erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Order erfolgreich auf %1 erstellt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Dieser Ordner wird bereits synchronisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1379,27 +1379,27 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Eine neue Version ist verfügbar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Eine neue Version des %1 - Klients ist verfügbar.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; steht zum Herunterladen bereit. Die installierte Version ist %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Diese Version auslassen</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Dieses Mal überspringen</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Update durchführen</translation>
    </message>
@@ -1900,7 +1900,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Zeitüberschreitung der Verbindung</translation>
    </message>
@@ -1908,7 +1908,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Ungültige JSON-Antwort von der Poll-URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <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="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Lokales Sychronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
    </message>
@@ -2479,7 +2479,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Mit Benutzern oder Gruppen teilen…</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Keine Ergebnisse für &apos;%1&apos;</translation>
    </message>
@@ -2512,17 +2512,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>Ändern</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>löschen</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifikation</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Erneute Authentifizierung erforderlich</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Der Dateiname ist zu lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Dateikodierung ist ungültig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <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="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <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="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3499,7 +3499,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>in der Zukunft</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>jetzt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln Sekunde(n)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Άκυρο</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Λογαριασμός</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Επιλέξτε τι θα συγχρονιστεί</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Αποτυχία αφαίρεσης φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Αδυναμία δημιουργίας τοπικού φακέλου &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Εκτελείται Συγχρονισμός </translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Η λειτουργία συγχρονισμού εκτελείται.&lt;br/&gt; Θέλετε να την τερματίσετε;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 σε χρήση</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 ως &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Συνδεδεμένο με %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Αποσυνδέθηκε από %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Είσοδος</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίστηκαν καθώς είναι πολύ μεγάλοι:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Αφαίρεση σύνδεσης</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Άνοιγμα φακέλου</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Αποσύνδεση</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Συνέχιση συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Παύση συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 από %2 σε χρήση</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation> Το %1 δεν είναι αναγνώσιμο. </translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 αφαιρέθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ληφθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ενημερωθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>Το %1 έχει μετονομαστεί σε %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>Το %1 έχει μετακινηθεί στο %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Δραστηριότητα Συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
 Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
 Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Αφαίρεση Όλων των Αρχείων;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Αφαίρεση όλων των αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Διατήρηση αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
    </message>
@@ -1378,27 +1378,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Νέα Έκδοση Διαθέσιμη </translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Μια νέα έκδοση του %1 Δέκτη είναι διαθέσιμη.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; είναι διαθέσιμη για λήψη. Η εγκατεστημένη έκδοση είναι %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Παράλειψη αυτής της έκδοσης</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Παράλειψη αυτή τη φορά</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Λήψη ενημέρωσης</translation>
    </message>
@@ -1900,7 +1900,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
    </message>
@@ -1908,7 +1908,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
    </message>
@@ -2479,7 +2479,7 @@ It is not advisable to use it.</source>
        <translation>Διαμοιρασμός με χρήστες ή ομάδες ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2512,17 +2512,17 @@ It is not advisable to use it.</source>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>δημιουργία</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>αλλαγή</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Πιστοποίηση</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Απαιτείται επανάληψη πιστοποίησης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation>
    </message>
@@ -2855,23 +2855,23 @@ It is not advisable to use it.</source>
        <translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln δευτερόλεπτο(α)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -112,8 +112,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
@@ -143,148 +143,148 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -587,57 +587,57 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -645,7 +645,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -653,7 +653,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -661,7 +661,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
@@ -669,7 +669,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
@@ -677,7 +677,7 @@
        </translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
@@ -685,12 +685,12 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
@@ -698,67 +698,67 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder &apos;%1&apos;.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder &apos;%1&apos;.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"></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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1401,27 +1401,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1921,7 +1921,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1929,7 +1929,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2500,7 +2500,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2533,17 +2533,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3518,7 +3518,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <source>Some time ago</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3592,56 +3592,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation type="unfinished"></translation>
    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation type="unfinished"></translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Cuenta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Elija qué sincronizar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Eliminar la sincronización de carpetas conectadas</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Hubo un fallo al crear la carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;No se pudo crear la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Eliminar carpeta de sincronización conectada</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Sincronización en curso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>La sincronización está en curso.&lt;br/&gt;¿Desea interrumpirla?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 en uso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>La versión del servidor %1 es antigua, ¡y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Conectado a %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Servidor %1 no está disponible temporalmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Cerró sesión desde %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Sin conexión a %1 en %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
-        <translation>Iniciar sesión</translation>
+        <translation>Ingresar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Hay carpetas nuevas que no fueron sincronizadas porque son demasiado grandes:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Confirmar eliminación de cuenta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;¿De verdad quiere eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminará los archivos.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Eliminar conexión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Abrir carpeta</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Cerrar sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Continuar sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Pausar sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;¿De verdad quiere dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; elminará los archivo.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 de %2 en uso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>No hay ninguna conexión de %1 configurada.</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>La carpeta local %1 no existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 debería ser un directorio, pero no lo es.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 es ilegible.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido eliminado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido descargado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido actualizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 ha sido renombrado a %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 ha sido movido a %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Actividad de la sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>No se ha podido leer el archivo de exclusión del sistema</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
 Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
 ¿Está seguro de que desea realizar esta operación?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>¿Eliminar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Eliminar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ esto es similar a restaurar un backup en el servidor.
 Continuar con la sincronización hará que todos los archivos sean sobreescritos con versiones anteriores de los mismos. Desea mantener los archivos locales sin cambios en caso de conflicto?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Backup detectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Sincronización Normal</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Mantener los archivos locales en caso de conflicto</translation>
    </message>
@@ -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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <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="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <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="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1209,7 +1209,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 User: %2
 Account: %3
 </source>
-        <translation>Por favor introduzca la contraseña de %1:
+        <translation>Por favor introduzca %1 contraseña:

 Usuario: %2
 Cuenta: %3
@@ -1380,27 +1380,27 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nueva versión disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Una nueva versión del programa cliente de %1 está disponible.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; está disponible para descargar. La versión instalada es la %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Saltarse esta versión</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Omitir esta vez</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Actualizar</translation>
    </message>
@@ -1901,7 +1901,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Tiempo de espera de conexión agotado</translation>
    </message>
@@ -1909,7 +1909,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Respuesta JSON invalida desde URL</translation>
    </message>
@@ -1955,17 +1955,17 @@ No se recomienda usarla.</translation>
        <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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Archivo eliminado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <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="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Falta la URL de la encuesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Protocolo de sincronización local</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copie la lista de actividades al portapapeles</translation>
    </message>
@@ -2480,7 +2480,7 @@ No se recomienda usarla.</translation>
        <translation>Compartir con usuarios o grupos ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>No hay resultados para &apos;%1&apos;</translation>
    </message>
@@ -2513,17 +2513,17 @@ No se recomienda usarla.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>crear</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>cambio</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>borrar</translation>
    </message>
@@ -2544,17 +2544,17 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticar</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Debe volver a autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>El nombre del archivo es demasiado largo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat ha fallado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <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="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <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="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <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="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <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="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No está permitido borrar, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>No está permitido mover, elemento restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -3500,7 +3500,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -3508,37 +3508,37 @@ No se recomienda usarla.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>en el futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>ahora</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n año</numerusform><numerusform>%n año(s)</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n Mes</numerusform><numerusform>%n Mese(s)</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dia(s)</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundos(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Cuenta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Falló la creacion de la carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;No pudó ser creada la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Sincronización en curso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>La sincronización está en curso.&lt;br/&gt;¿Querés interrumpirla?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 de &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Conectado a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>El servidor %1 esta temporalmente sin conexión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Registrado desde %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Sin conexión a %1 desde %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Iniciar sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Confirmar la eliminación de la cuenta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Eliminar conexión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Abrir carpeta</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Cerrar la sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Reanudar sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Pausar sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Realmente quieres detener la sincronización de la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminara ningun archivo.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 de %2 en uso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>No hay ninguna conexión de %1 configurada.</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>El directorio local %1 no existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 debé ser una carpeta pero no lo es.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>No se puede leer %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1  ha sido eliminado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido descargado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ha sido actualizado</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Actividad de Sync</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>¿Borrar todos los archivos?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Borrar todos los archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Conservar archivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <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="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1369,27 +1369,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nueva versión disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Saltear esta vez</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Obtener actualización</translation>
    </message>
@@ -1889,7 +1889,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"/>
    </message>
@@ -1897,7 +1897,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar la lista de actividades al portapapeles.</translation>
    </message>
@@ -2468,7 +2468,7 @@ It is not advisable to use it.</source>
        <translation>Compartir con usuario o grupo ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2501,17 +2501,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>crear</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>borrar</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3487,7 +3487,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundo(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Loobu</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Vali, mida sünkroniseerida</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Kausta loomine ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Sünkroniseerimine on käimas</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Sünkroniseerimine on käimas.&lt;br/&gt;Kas sa soovid seda lõpetada?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 kasutusel</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 as &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Ühendatud %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Server %1 pole ajutiselt saadaval.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Logi sisse</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Kinnita konto eemaldamine</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Eemalda ühendus</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Ava kaust</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Logi välja</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Taasta sünroonimist</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Peata sünkroonimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Hetkel pole mahu kasutuse info saadaval.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Ühtegi %1 ühendust pole seadistatud.</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Kohalikku kausta %1 pole olemas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 pole loetav.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on alla laaditud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on uuendatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 on ümber nimetatud %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 on tõstetud %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Sünkroniseerimise tegevus</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Kustutada kõik failid?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Kustutada kõik failid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Säilita failid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Leiti varukoopia</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Tavaline sünkroonimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Loo kaugkaust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 - kaust on loodud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Seda kataloogi juba sünkroniseeritakse.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1369,27 +1369,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Saadaval on uuem versioon</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Uus versioon %1 kliendist on saadaval.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; on saadaval alla laadimiseks. Paigaldatud on versioon %3.&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Jäta see versioon vahele</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Jäta seekord vahele</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Hangi uuendus</translation>
    </message>
@@ -1890,7 +1890,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Ühenduse aegumine</translation>
    </message>
@@ -1898,7 +1898,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Faili on pärast avastamist muudetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <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="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Küsitluse URL puudub</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
    </message>
@@ -2469,7 +2469,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Jaga kasutajate või gruppidega ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2502,17 +2502,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>loo</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>muuda</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>kustuta</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Vajalik on uuesti autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -2845,23 +2845,23 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Faili nimi on liiga pikk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Failinime kodeering pole kehtiv</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3489,7 +3489,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -3497,37 +3497,37 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>tulevikus</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>kohe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln sekund(it)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Ezeztatu</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Kontua</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Hautatu zer sinkronizatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Ezabatu karpeta honen konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Karpeta sortzeak huts egin du</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Ezin izan da &lt;i&gt;%1&lt;/i&gt; bertako karpeta sortu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Ezabatu Karpeta Honen Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Sinkronizazioa martxan da</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Sinkronizazio martxan da.&lt;br/&gt;Bukatu nahi al duzu?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>%1ra konektatuta.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>%1 zerbitzaria ez dago orain eskuragarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>%1etik saioa itxita.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Hasi saioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Sinkronizatuko ez diren oso handiak diren karpeta berriak daude:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Baieztatu Kontuaren Ezabatzea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Ezabatu konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Ireki karpeta</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Saioa bukatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Berrekin sinkronizazioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Gelditu sinkronizazioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%2tik %1 erabilita</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Ez dago %1 konexiorik konfiguratuta.</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Bertako %1 karpeta ez da existitzen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 karpeta bat izan behar zen baina ez da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 ezin da irakurri.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 ezabatua izan da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 deskargatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 kargatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1  %2-(e)ra berrizendatu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 %2-(e)ra mugitu da.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Sinkronizazio Jarduerak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Ezabatu Fitxategi Guztiak?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Ezabatu fitxategi guztiak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Mantendu fitxategiak</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Sortu Urruneko Karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentikazioak huts egin du %1en sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <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="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1375,27 +1375,27 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Bertsio berria eskuragarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt; %1 bezeroaren bertsio berri bat eskuragarri dago.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt;deskargatzeko prest dago. Instalatuta dagoen bersioa %3 da.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Ez eguneratu bertsio hau</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Utzi aldi honetan</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Eskuratu eguneraketa</translation>
    </message>
@@ -1896,7 +1896,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Konexioa denboraz kanpo</translation>
    </message>
@@ -1904,7 +1904,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fitxategia Ezabatua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Bertako sinkronizazio protokolo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiatu jarduera zerrenda arbelara.</translation>
    </message>
@@ -2475,7 +2475,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Elkarbanatu erabiltzaile edo taldearekin...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2508,17 +2508,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>sortu</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>aldatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>ezabatu</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Berautentikatzea beharrezkoa</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2849,23 +2849,23 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Ezin da sinkronizazio egunerokoa ireki</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <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="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3493,7 +3493,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -3501,37 +3501,37 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundu</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>منصرف شدن</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>حساب کاربری</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>انتخاب موارد همگام‌سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>همگام سازی در حال اجراست</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>عملیات همگام سازی در حال اجراست.&lt;br/&gt;آیا دوست دارید آن را متوقف کنید؟</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>متصل به %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>ورود</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>بازکردن پوشه</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>خروج</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>از سر‎گیری همگام‌سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>توقف به‌هنگام‌سازی </translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>بدون %1 اتصال پیکربندی شده.</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>پوشه محلی %1 موجود نیست.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 قابل خواندن نیست.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بارگزاری شد.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بروز رسانی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 به %2 تغییر نام داده شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 به %2 انتقال داده شده است.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>فعالیت همگام سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>حذف تمام فایل ها؟</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>حذف تمام فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>نگه داشتن فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>پوشه با موفقیت ایجاد شده است  %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>این پوشه همگام‌سازی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1369,27 +1369,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>نسخه جدید در دسترس است</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>نادیده گرفتن این نسخه</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>نادیده گرفتن این زمان</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>به دست آوردن به روز رسانی</translation>
    </message>
@@ -1889,7 +1889,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>تایم اوت اتصال</translation>
    </message>
@@ -1897,7 +1897,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>فایل حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>کپی کردن</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
@@ -2468,7 +2468,7 @@ It is not advisable to use it.</source>
        <translation>اشتراک گذاری با کاربران یا گروه ها ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2501,17 +2501,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>ایجاد</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>تغییر</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>حذف</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation>خطا در هنگام خواندن پوشه</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>نام فایل خیلی طولانی است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>وضعیت ناموفق</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>رمزگذاری نام فایل معتبر نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>کاراکتر نامعتبر، لطفا &quot;%1&quot; را تغییر نام دهید</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>حذف مجاز نیست، در حال بازگردادن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>فایل‌های محلی و پوشه‌ی اشتراک حذف شد.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3486,7 +3486,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln ثانیه(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Peruuta</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Tili</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Valitse synkronoitavat tiedot</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Poista kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Kansion luominen epäonnistui</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Paikallisen kansion &lt;i&gt;%1&lt;/i&gt; luominen epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Vahvista kansion synkronointiyhteyden poisto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Poista kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Synkronointi meneillään</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Synkronointioperaatio on meneillään.&lt;br/&gt;Haluatko keskeyttää sen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 käytössä</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 käyttäjänä &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>Palvelimen versio %1 on vanha ja sen tuki on loppunut! Jatka omalla vastuulla.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Yhteys muodostettu kohteeseen %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Palvelin %1 ei ole juuri nyt saatavilla.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Kirjauduttu ulos kohteesta %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Ei yhteyttä kohteeseen %1 osoitteessa %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Kirjaudu sisään</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Havaittiin uusia kansioita, joita ei synkronoitu niiden suuren koon vuoksi:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Vahvista tilin poistaminen</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Haluatko varmasti poistaa tilin &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Poista yhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Avaa kansio</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Kirjaudu ulos</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Palauta synkronointi</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Keskeytä synkronointi</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Haluatko varmasti lopettaa kansion &lt;i&gt;%1&lt;/i&gt; synkronoinnin?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1/%2 (%3 %) käytössä. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sisältää eri rajoitukset.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1/%2 käytössä</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>%1-yhteyttä ei ole määritelty.</translation>
    </message>
@@ -579,158 +579,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Paikallista kansiota %1 ei ole olemassa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 ei ole luettavissa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on ladattu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 on päivitetty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 on nimetty uudeelleen muotoon %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 on siirretty kohteeseen %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Synkronointiaktiviteetti</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
 Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Poistetaanko kaikki tiedostot?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Poista kaikki tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Säilytä tiedostot</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Varmuuskopio poistettu</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normaali synkronointi</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Lisää kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Luo etäkansio</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Tätä kansiota synkronoidaan jo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1376,27 +1376,27 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Uusi versio saatavilla</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Uusi versio %1-asiakasohjelmistosta on saatavilla.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; on ladattavissa. Asennettu versio on %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Ohita tämä versio</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Ohita tämän kerran</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Päivitä</translation>
    </message>
@@ -1897,7 +1897,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Yhteys aikakatkaistiin</translation>
    </message>
@@ -1905,7 +1905,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Paikallinen synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopioi toimilista leikepöydälle.</translation>
    </message>
@@ -2476,7 +2476,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Jaa käyttäjien tai ryhmien kanssa…</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Ei tuloksia haulla &apos;%1&apos;</translation>
    </message>
@@ -2509,17 +2509,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>luo</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>muuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>poista</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Tunnistaudu</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Tunnistaudu uudelleen</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Tiedosto on ohituslistalla.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Tiedoston nimi on liian pitkä.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <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="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3496,7 +3496,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>tulevaisuudessa</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>nyt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation>Alle minuutti sitten</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n kuukausi</numerusform><numerusform>%n kuukautta</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n minuutti</numerusform><numerusform>%n minuuttia</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n sekunti</numerusform><numerusform>%n sekuntia</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln s</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Annuler</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Compte</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Choisir le contenu à synchroniser</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Supprimer la synchronisation du dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Échec de création du dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Impossible de créer le dossier local &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Confirmer une suppression de synchronisation de dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Supprimer la synchronisation de ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Synchronisation en cours</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous l&apos;arrêter ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 utilisés</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 en tant que &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>La version %1 du serveur est ancienne et n&apos;est pas prise en charge. Continuez à vos risques et périls.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Connecté à %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Le serveur %1 est temporairement indisponible.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Session sur %1 fermée.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Pas de connexion à %1 sur %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Se connecter</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Certains dossiers n&apos;ont pas été synchronisés en raison de leur taille trop importante :</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Confirmer la suppression du compte</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Êtes-vous sûr de vouloir enlever le compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Supprimer la connexion</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Ouvrir le dossier</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Se déconnecter</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Reprendre</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Mettre en pause</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Voulez-vous vraiment arrêter de synchroniser le dossier &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) de %2 utilisés. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 sur %2 utilisés</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Actuellement aucune information d&apos;utilisation de stockage n&apos;est disponible.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Aucune connexion à %1 configurée</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Le dossier local %1 n&apos;existe pas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 devrait être un dossier mais ne l&apos;est pas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 ne peut pas être lu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1 : %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été supprimé.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été téléchargé.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 a été mis à jour.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 a été renommé en %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 a été déplacé vers %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et  %n autres fichiers ont été déplacés.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>%1 ne peut pas être synchronisé en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n&apos;ont pas pu être synchronisés en raison d&apos;erreurs. Consultez les logs pour les détails.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 n&apos;a pu être synchronisé pour cause d&apos;erreur. Consultez les logs pour les détails.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Activité de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
 Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Peut-être la configuration a-t-elle été modifiée, ou les fichiers  supprimé
 Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Supprimer tous les fichiers ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Supprimer tous les fichiers</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Garder les fichiers</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
 Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d&apos;un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Sauvegarde détecté</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Synchronisation normale</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Garder les fichiers locaux comme Conflits</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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ajouter une synchronisation de dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Créer un dossier distant</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <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="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1380,27 +1380,27 @@ Les éléments dont la suppression automatique est permise seront supprimés s&a
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nouvelle version disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Une nouvelle version du client %1 est disponible.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; est disponible au téléchargement. La version actuellement installée est %3.&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Ignorer cette version</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Ignorer pour cette fois</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Obtenir la mise à jour</translation>
    </message>
@@ -1902,7 +1902,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Délai d&apos;attente de connexion dépassé</translation>
    </message>
@@ -1910,7 +1910,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>L&apos;URL interrogéé a renvoyé une réponse json non valide</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.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>
@@ -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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fichier supprimé</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>URL de sondage manquante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Protocole de synchronisation locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copier la liste d&apos;activités dans le presse-papier.</translation>
    </message>
@@ -2481,7 +2481,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Partager avec des utilisateurs ou groupes...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Aucun résultat pour &apos;%1&apos;</translation>
    </message>
@@ -2514,17 +2514,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>création</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>modification</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>suppression</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifier</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Nouvelle authentification nécessaire</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Le nom de fichier est trop long.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat échoué.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <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="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <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="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <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="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <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="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <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="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -3501,7 +3501,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>Dans le futur</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>maintenant</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln seconde(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Conta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Escolla que sincronizar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Non foi posíbel crear o cartafol</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Non foi posíbel crear o cartafol local &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Sincronización en proceso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Estase a realizar a sincronización.&lt;br/&gt;Quere interrompela e rematala?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Conectado a %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>O servidor %1 non está dispoñíbel temporalmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Desconectado de %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Non hai conexión con %1 en %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Acceder</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Abrir o cartafol</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Desconectar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Continuar coa sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Por en pausa a sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Non se configurou a conexión %1.</translation>
    </message>
@@ -579,158 +579,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>O cartafol local %1 non existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 non é lexíbel.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi retirado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi descargado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi enviado satisfactoriamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 foi renomeado satisfactoriamente a %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 foi movido satisfactoriamente a %2</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Actividade de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Foi engadido un novo cartafol maior de  %1 MB: %2.
 Vaia aos axustes e seleccióneo se quere descargalo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Retirar todos os ficheiros?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Retirar todos os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Manter os ficheiros</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crear un cartafol remoto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Este cartafol xa está sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1374,27 +1374,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Hai dispoñíbel unha nova versión</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Hai dispoñíbel unha nova versión do cliente %1.&lt;/p&gt;&lt;p&gt;Pode descargar a versión &lt;b&gt;%2&lt;/b&gt;. A versión instalada é a %3&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Omitir esta versión</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Omitir polo de agora</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Obter a actualización</translation>
    </message>
@@ -1896,7 +1896,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Esgotouse o tempo de conexión</translation>
    </message>
@@ -1904,7 +1904,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>O URL requirido devolveu unha resposta JSON incorrecta</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <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="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Non se atopa o URL requirido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista da actividade no portapapeis.</translation>
    </message>
@@ -2475,7 +2475,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Compartir con usuarios ou grupos ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2508,17 +2508,17 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>crear</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>cambio</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>eliminar</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticado</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>É necesario volver autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -2851,23 +2851,23 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <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="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Fallou a obtención de estatísticas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <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="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <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="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -3495,7 +3495,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -3503,37 +3503,37 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundo(s)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Mégsem</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Fiók</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Szinkronizálandó elemek kiválasztása</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Könyvtár szinkronizációs kapcsolat törlése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Könyvtár létrehozása nem sikerült</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Nem lehet helyi könyvtárat létrehozni: &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Könyvtár szinkronizációs kapcsolat törlésének megerősítése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Könyvtár szinkronizációs kapcsolat törlése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Szinkronizálás fut</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>A szinkronizálás folyamatban van. &lt;br/&gt;Szakítsuk meg?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 használatban</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1, mint &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>%1 szerver verzió régi és már nem támogatott! Folytatás saját felelősségre.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Csatlakozva: %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>%1 szerver jelenleg nem elérhető.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Kijelentkezve innen: %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Nincs kapcsolat ehhez: %1 ekkor: %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Bejelentkezés</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Néhány új könyvtár nem került szinkronizálása, mert azok túl nagyok:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Fiók törlésének megerősítése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Tényleg törölni szeretné a kapcsolatot &lt;i&gt;%1&lt;/i&gt; fiókkal?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Kapcsolat törlése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Könyvtár megnyitása</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Kilépés</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Szinkronizálás folytatása</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Szinkronizálás szüneteltetése</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Tényleg leszeretné állítani &lt;i&gt;%1&lt;/i&gt; könyvtár szinkronizálását?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) / %2 használatban. Néhány könyvtár - beleértve a hálózati megosztásokat és a megosztott könyvtárakat - eltérő korlátozással rendelkezhet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 / %2 használatban</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Jelenleg nem érhető el tárhelyhasználati információ.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Nincs beállított kapcsolat: %1.</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>%1 helyi mappa nem létezik.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 valószínűleg könyvtár, de nem az.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 nem olvasható.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen törölve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen letöltve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 sikeresen feltöltve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 átnevezve erre: %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 áthelyezve ide: %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Szinkronizálási aktivitás</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Törli az összes fájlt?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Összes fájl eltávolítása</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Fájlok megtartása</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Biztonsági mentés észlelve</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normal szinkronizáció</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Helyi file-ok megtartása konfliktusként</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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <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="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1373,27 +1373,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Új verzió érhető el</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Egy új verzió érhető el a(z) %1 kliensből.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; elérhető letöltésre. A telepített verzió: %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Verzió kihagyása</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Kihagyás ezalkalommal</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Frissítés beszerzése</translation>
    </message>
@@ -1893,7 +1893,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Kapcsolat időtúllépés</translation>
    </message>
@@ -1901,7 +1901,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fájl törölve</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Másolás</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Az aktivitási lista másolása a vágólapra.</translation>
    </message>
@@ -2472,7 +2472,7 @@ It is not advisable to use it.</source>
        <translation>Megosztás felhasználókkal vagy csoportokkal ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2505,17 +2505,17 @@ It is not advisable to use it.</source>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>létrehoz</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>változtatás</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>törlés</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Azonosítás</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2847,23 +2847,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Fájlnév túl nagy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>a cél</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>a forrás</translation>
    </message>
@@ -3491,7 +3491,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln másodperc</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Annulla</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Account</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Scegli cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Rimuovi connessione di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Creazione della cartella non riuscita</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Impossibile creare la cartella locale &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Rimuovi connessione di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>La sincronizzazione è in corso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>L&apos;operazione di sincronizzazione è in corso.&lt;br/&gt;Vuoi terminarla?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 in uso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 come &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>La versione %1 del server è datata e non supportata! Continua a tuo rischio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Connesso a %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Il server %1 è temporaneamente non disponibile.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Disconnesso da %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Nessuna connessione a %1 su %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Accedi</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Conferma rimozione account</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Vuoi davvero eliminare la connessione all&apos;account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Rimuovi connessione</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Apri cartella</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Esci</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Riprendi la sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Sospendi la sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Vuoi davvero fermare la sincronizzazione della cartella &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1% di %2 in uso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Non ci sono informazioni disponibili sull&apos;utilizzo dello spazio di archiviazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Nessuna connessione di %1 configurata.</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>La cartella locale %1 non esiste.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 non è leggibile.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato rimosso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato scaricato.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 è stato aggiornato.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 è stato rinominato in %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 è stato spostato in %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Sincronizza attività</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Impossibile leggere il file di esclusione di sistema</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
 Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
 Sei sicuro di voler eseguire questa operazione?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Vuoi rimuovere tutti i file?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Rimuovi tutti i file</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Mantieni i file</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
 Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Backup rilevato</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Sincronizzazione normale</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Mantieni i file locali come conflitto</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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crea cartella remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Questa cartella è già sincronizzata.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1380,27 +1380,27 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nuova versione disponibile</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Una nuova versione del client %1 è disponibile.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; è disponibile per lo scaricamento. La versione installata è %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Salta questa versione</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Salta questa volta</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Ottieni l&apos;aggiornamento</translation>
    </message>
@@ -1901,7 +1901,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Connessione scaduta</translation>
    </message>
@@ -1909,7 +1909,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Risposta JSON non valida dall&apos;URL di richiesta</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <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="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>URL di richiesta mancante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Protocollo di sincronizzazione locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia l&apos;elenco delle attività negli appunti.</translation>
    </message>
@@ -2480,7 +2480,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Condividi con utenti o gruppi...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Nessun risultato per &apos;%1&apos;</translation>
    </message>
@@ -2513,17 +2513,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>crea</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>cambia</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>elimina</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Nuova autenticazione richiesta</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Il nome del file è troppo lungo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat non riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <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="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <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="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <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="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -3500,7 +3500,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -3508,37 +3508,37 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>nel futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>adesso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>% anno</numerusform><numerusform>%n anni</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln secondo(i)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <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>Lorem ipsum dolor sit amet</translation>
+        <translation type="unfinished"/>
    </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>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>キャンセル</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>アカウント</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>同期フォルダーを選択</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>同期フォルダー接続を削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>フォルダーの作成に失敗しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;ローカルフォルダー &lt;i&gt;%1&lt;/i&gt; を作成できません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>同期フォルダー接続の削除を確認</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>同期フォルダー接続を削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>同期を実行中</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>同期作業を実行中です。&lt;br/&gt;終了しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 を使用中</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>&lt;i&gt;%2&lt;/i&gt; の %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>サーバーバージョン %1 は古くサポートされていません！自己責任で進んでください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>%1 に接続</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>サーバー %1 は一時的に利用できません</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>%1 からサインアウトしました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>%2 の %1 への接続がありません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>ログイン</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>容量が大きいため、同期されていない新規フォルダーがあります:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>アカウント削除確認</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt; アカウント &lt;i&gt;%1&lt;/i&gt; を本当に削除しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>接続削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>フォルダーを開く</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>ログアウト</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>再開</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>一時停止</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか？&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%2 のうち %1 を使用中</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>現在、利用できるストレージ利用状況はありません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>%1 の接続は設定されていません。</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>ローカルフォルダー %1 は存在しません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 は読み込み可能ではありません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 は削除されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 はダウンロードされました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 が更新されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 の名前が %2 に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 は %2 に移動しました。</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>同期アクティビティ</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>システム上の除外ファイルを読み込めません</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>新しい %1 MB以上のフォルダーが追加されました: %2
 ダウンロードしたい場合は、設定画面で選択してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
 本当にこの操作を実行しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>すべてのファイルを削除しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>すべてのファイルを削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>ファイルを残す</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 このまま同期を続けた場合、あたらしいファイルが全て古いファイルで上書きされます。ローカルファイルで新しいものをコンフリクトファイルとして保持しますか？</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>バックアップが検出されました</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>正常同期</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>コンフリクト時にローカルファイルを保持</translation>
    </message>
@@ -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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>同期フォルダーを追加</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>リモートフォルダーを追加</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 にフォルダーが作成されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>%1 アクセス中に認証に失敗しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>フォルダーをリストアップできません。エラー: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>アカウント全体を同期する場合はこちらを選択</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>このフォルダーはすでに同期されています。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>何を同期するか選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
    </message>
@@ -1380,27 +1380,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>新しいバージョンが利用可能です</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1 クライアントの新しいバージョンが利用可能です。&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; がダウンロード可能です。インストールされているバージョンは %3 です。&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>今回のバージョンをスキップ</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>今回はスキップ</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>アップデートを取得</translation>
    </message>
@@ -1900,7 +1900,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>接続タイムアウト</translation>
    </message>
@@ -1908,7 +1908,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>不正なJSONがポーリングURLから返りました</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>ファイルは発見以降に変更されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>ファイルを削除しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>ポーリングURLがありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>ローカルファイルを同期中に削除します。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>ローカルファイル同期状況</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>コピー</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>アクティビティ一覧をコピーする</translation>
    </message>
@@ -2479,7 +2479,7 @@ It is not advisable to use it.</source>
        <translation>ユーザーもしくはグループと共有 ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>&apos;%1&apos; は見つかりませんでした</translation>
    </message>
@@ -2512,17 +2512,17 @@ It is not advisable to use it.</source>
        <translation>…</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>作成</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>更新</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - 認証</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>再認証が必要</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>セッションの期限が切れました。クライアントを使用し続けるには再ログインが必要です。</translation>
    </message>
@@ -2855,23 +2855,23 @@ It is not advisable to use it.</source>
        <translation>フォルダーの読み込みエラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>隠しファイル/フォルダのため無視されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>同期機能はシンボリックリンクをサポートしていません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>ファイルは除外リストに登録されています。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>ファイル名が長すぎます</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>情報取得エラー</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>ファイル名のエンコーディングが無効です。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>無効な文字です、&quot;%1&quot; を変更してください。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>同期ジャーナルの初期化ができません。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>ローカルデータベースからブラックリストを読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation>同期ジャーナルから読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>同期ジャーナルを開くことができません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>削除できないので復元しています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>ローカルファイルと共有フォルダーを削除しました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>移動できないので項目を復元しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 は読み取り専用のため移動できません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>今後</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n日前</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n 時間前</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>今</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation>1分以内</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform> %n 分前</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n 年</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n ヶ月</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n 日</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n 時間</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n 分</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n 秒</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln秒</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Avbryt</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Velg hva som synkroniseres</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Fjern tilkobling for mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Oppretting av mappe feilet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Klarte ikke å opprette lokal mappe &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Fjern tilkobling for mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Synkroniserer...</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Synkronisering kjører.&lt;br/&gt;Vil du avbryte den?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 i bruk</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>Server-versjonen %1 er gammel og støttes ikke! Fortsett på egen risiko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Tilkoblet %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Server %1 er midlertidig utilgjengelig.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Logget ut fra %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Ingen tilkobling til %1 på %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Logg inn</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Det finnes nye mapper som ikke ble synkronisert fordi de er for store: </translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Bekreft fjerning av konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Vil du virkelig fjerne tilkoblingen til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Fjern tilkobling</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Åpne mappe</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Logg ut</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Fortsett synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Sett synkronisering på pause</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Vil du virkelig stoppe synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 av %2 i bruk</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Ingen %1-forbindelse konfigurert.</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokal mappe %1 eksisterer ikke.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 skal være en mappe men er ikke det.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 kan ikke leses.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt lastet ned.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 har blitt oppdatert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 har blitt omdøpt til %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 har blitt flyttet til %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Synkroniseringsaktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
 Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
 Er du sikker på at du vil utføre denne operasjonen?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Fjerne alle filer?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Fjern alle filer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Behold filer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren.
 Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Backup oppdaget</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normal synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behold lokale filer som konflikt</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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Legg til mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Opprett ekstern mappe</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Mappen ble opprettet på %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentisering feilet ved tilgang til %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Denne mappen synkroniseres allerede.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1380,27 +1380,27 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Ny versjon tilgjengelig</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;En ny versjon av %1-klienten er tilgjengelig.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; er tilgjengelig for nedlasting. Installert versjon er %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Hopp over denne versjonen</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Hopp over denne gangen</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Hent oppdatering</translation>
    </message>
@@ -1902,7 +1902,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Tidsavbrudd ved tilkobling</translation>
    </message>
@@ -1910,7 +1910,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Ugyldig JSON-svar fra forespørsels-URL</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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fil fjernet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Forespørsels-URL mangler</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Lokal synkroniseringsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopier aktivitetslisten til utklippstavlen.</translation>
    </message>
@@ -2481,7 +2481,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Del med brukere eller grupper ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Ingen resultater for &apos;%1&apos;</translation>
    </message>
@@ -2514,17 +2514,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>opprette</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>endre</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>slett</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autentiser</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Ny autentisering kreves</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Filen ligger på ignoreringslisten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Filnavn er for langt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Filnavn-koding er ikke gyldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan ikke åpne synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ikke tillatt å fjerne, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale filer og delingsmappe fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Flytting ikke tillatt, element gjenopprettet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>målet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>kilden</translation>
    </message>
@@ -3501,7 +3501,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>LTR</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>fram i tid</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>nå</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln sekund(er)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Annuleren</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Account</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Selectieve synchronisatie</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Verwijderen map sync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Maken map mislukt</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Kon lokale map &lt;i&gt;%1&lt;/i&gt; niet maken.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Bevestig verwijderen Map Sync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Verwijderen Map Sync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Bezig met synchroniseren</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Bezig met synchroniseren.&lt;br/&gt;Wilt u stoppen met synchroniseren?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 in gebruik</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>De serverversie %1 is oud en wordt niet meer ondersteund. Verdergaan is op eigen risico.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Verbonden met %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Server %1 is tijdelijk niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Uitgelogd van %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Geen verbinding met %1 op %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Meld u aan</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Bevestig verwijderen account</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Wilt u echt de verbinding met het account &lt;i&gt;%1&lt;/i&gt; verbreken?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Hierdoor verwijdert u &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Verwijderen verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Openen map</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Afmelden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Hervatten sync</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Pauzeren sync</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Weet u zeker dat u de synchronisatie van map &lt;i&gt;%1&lt;/i&gt; wilt stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opmerking:&lt;/b&gt; Dit zal &lt;b&gt;geen&lt;/b&gt; bestanden verwijderen.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 van %2 in gebruik</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Geen %1 connectie geconfigureerd.</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Lokale map %1 bestaat niet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 is niet leesbaar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is verwijderd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is gedownload.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 is bijgewerkt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 is hernoemd naar %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 is verplaatst naar %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <location filename="../src/gui/folder.cpp" line="494"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <location filename="../src/gui/folder.cpp" line="501"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <location filename="../src/gui/folder.cpp" line="508"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><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="517"/>
+        <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><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="524"/>
+        <location filename="../src/gui/folder.cpp" line="529"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><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="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Synchronisatie-activiteit</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
 Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Dat zou kunnen gebeuren, omdat de map stilletjes was geherconfigureerd, of omdat
 Weet je zeker dat je door wilt gaan?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Verwijder alle bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Verwijder alle bestanden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Bewaar bestanden</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Dit kan komen doordat een backup is hersteld op de server.
 Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere versie. Wilt u uw lokale meer recentere bestanden behouden als conflict bestanden?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Backup gedetecteerd</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normale synchronisatie</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behoud lokale bestanden als conflict</translation>
    </message>
@@ -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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Externe map aanmaken</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Authenticatie mislukt bij benaderen %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <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="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Deze map is al gesynchroniseerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1381,27 +1381,27 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nieuwe versie beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Er is een nieuwe versie van de %1 Client beschikbaar.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is beschikbaar voor download. De geïnstalleerde versie is %3.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Deze versie overslaan.</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Deze keer overslaan</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Ophalen update</translation>
    </message>
@@ -1903,7 +1903,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Verbindingstime-out</translation>
    </message>
@@ -1911,7 +1911,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Ongeldig JSON antwoord van de opgegeven URL</translation>
    </message>
@@ -1957,17 +1957,17 @@ We adviseren deze site niet te gebruiken.</translation>
        <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="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <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="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <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="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <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="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>URL opvraag ontbreekt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <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="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Lokaal sync protocol</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopiëren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopieer de activiteitenlijst naar het klembord.</translation>
    </message>
@@ -2482,7 +2482,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Delen met gebruikers of groepen ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Geen resultaten voor &apos;%1&apos;</translation>
    </message>
@@ -2515,17 +2515,17 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>creëer</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>wijzig</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>verwijderen</translation>
    </message>
@@ -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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - authenticeren</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Hernieuwde authenticatie nodig</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>De bestandsnaam is te lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Bestandsnaamcodering is niet geldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <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="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <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="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <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="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan om te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <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="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -3502,7 +3502,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</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="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>in de toekomst</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>nu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <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="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n year(s)</source>
-        <translation><numerusform>%n jaar</numerusform><numerusform>%n jaar</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="320"/>
-        <source>%n month(s)</source>
-        <translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="321"/>
-        <source>%n day(s)</source>
-        <translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="322"/>
-        <source>%n hour(s)</source>
-        <translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="323"/>
-        <source>%n minute(s)</source>
-        <translation><numerusform>%n minuut</numerusform><numerusform>%n minuten</numerusform></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="324"/>
-        <source>%n second(s)</source>
-        <translation><numerusform>%n seconde</numerusform><numerusform>%n seconden</numerusform></translation>
+    <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln seconde(n)</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <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>Lorem ipsum dolor sit amet</translation>
+        <translation type="unfinished"/>
    </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>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -110,8 +110,8 @@
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="352"/>
-        <location filename="../src/gui/accountsettings.cpp" line="690"/>
+        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="684"/>
        <source>Cancel</source>
        <translation>Anuluj</translation>
    </message>
@@ -141,148 +141,148 @@
        <translation>Konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="221"/>
+        <location filename="../src/gui/accountsettings.cpp" line="215"/>
        <source>Choose what to sync</source>
        <translation>Wybierz co synchronizować</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="229"/>
+        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
        <translation>Usuń folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="294"/>
+        <location filename="../src/gui/accountsettings.cpp" line="288"/>
        <source>Folder creation failed</source>
        <translation>Nie udało się stworzyć katalogu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="295"/>
+        <location filename="../src/gui/accountsettings.cpp" line="289"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
        <translation>&lt;p&gt;Nie można stworzyć lokalnego katalogu &lt;i&gt;%1&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="345"/>
+        <location filename="../src/gui/accountsettings.cpp" line="339"/>
        <source>Confirm Folder Sync Connection Removal</source>
        <translation>Usuń folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="351"/>
+        <location filename="../src/gui/accountsettings.cpp" line="345"/>
        <source>Remove Folder Sync Connection</source>
        <translation>Usuń folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="433"/>
+        <location filename="../src/gui/accountsettings.cpp" line="427"/>
        <source>Sync Running</source>
        <translation>Synchronizacja uruchomiona</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="434"/>
+        <location filename="../src/gui/accountsettings.cpp" line="428"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
        <translation>Operacja synchronizacji jest uruchomiona.&lt;br&gt;Czy chcesz ją zakończyć?</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="501"/>
+        <location filename="../src/gui/accountsettings.cpp" line="495"/>
        <source>%1 in use</source>
        <translation>%1 w użyciu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="521"/>
+        <location filename="../src/gui/accountsettings.cpp" line="515"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
        <translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="527"/>
+        <location filename="../src/gui/accountsettings.cpp" line="521"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
        <translation>Wersja serwera %1 jest przestarzała i nie jest już wspierana. Kontynuujesz na własne ryzyko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="529"/>
+        <location filename="../src/gui/accountsettings.cpp" line="523"/>
        <source>Connected to %1.</source>
        <translation>Podłączony do %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="531"/>
+        <location filename="../src/gui/accountsettings.cpp" line="525"/>
        <source>Server %1 is temporarily unavailable.</source>
        <translation>Serwer %1 jest tymczasowo niedostępny.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="533"/>
+        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>Signed out from %1.</source>
        <translation>Wylogowano z %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="535"/>
+        <location filename="../src/gui/accountsettings.cpp" line="529"/>
        <source>No connection to %1 at %2.</source>
        <translation>Brak połączenia do %1 z %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="558"/>
+        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
        <translation>Zaloguj</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="642"/>
+        <location filename="../src/gui/accountsettings.cpp" line="636"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
        <translation>Istnieją nowe foldery, które nie zostały zsynchronizowane, gdyż są za duże.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="682"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
        <source>Confirm Account Removal</source>
        <translation>Potwierdź usunięcie konta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="683"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
        <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Czy na pewno chcesz usunąć połączenie z kontem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt;  ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików klienta.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="689"/>
+        <location filename="../src/gui/accountsettings.cpp" line="683"/>
        <source>Remove connection</source>
        <translation>Usuwanie połączenia</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="217"/>
+        <location filename="../src/gui/accountsettings.cpp" line="211"/>
        <source>Open folder</source>
        <translation>Otwórz katalog</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="145"/>
-        <location filename="../src/gui/accountsettings.cpp" line="560"/>
+        <location filename="../src/gui/accountsettings.cpp" line="554"/>
        <source>Log out</source>
        <translation>Wyloguj</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Resume sync</source>
        <translation>Przywróć synchronizację</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="226"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
        <source>Pause sync</source>
        <translation>Zatrzymaj synchronizację</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="346"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Czy na pewno chcesz zatrzymać synchronizację folderu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików z klienta.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="488"/>
+        <location filename="../src/gui/accountsettings.cpp" line="482"/>
        <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
        <translation>%1 (%3%) z %2 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="489"/>
+        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>%1 of %2 in use</source>
        <translation>%1 z %2 w użyciu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="498"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
        <source>Currently there is no storage usage information available.</source>
        <translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountsettings.cpp" line="541"/>
+        <location filename="../src/gui/accountsettings.cpp" line="535"/>
        <source>No %1 connection configured.</source>
        <translation>Połączenie %1 nie skonfigurowane.</translation>
    </message>
@@ -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>Niezsynchronizowany (%1)</translation>
+        <translation type="unfinished"/>
    </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>Wymagana akcja: Powiadomienia</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="144"/>
@@ -450,7 +450,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="361"/>
        <source>You received new notifications from %1, %2 and other accounts.</source>
-        <translation>Otrzymałeś nowe powiadomienia z %1, %2 i innych kont.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="365"/>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="129"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>Folder lokalny %1 nie istnieje.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="132"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 powinien być katalogiem, ale nie jest.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="135"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 jest nie do odczytu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="381"/>
+        <location filename="../src/gui/folder.cpp" line="386"/>
        <source>%1: %2</source>
        <extracomment>this displays an error string (%2) for a file %1</extracomment>
        <translation>%1: %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="491"/>
+        <location filename="../src/gui/folder.cpp" line="496"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został usunięty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="498"/>
+        <location filename="../src/gui/folder.cpp" line="503"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został ściągnięty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="505"/>
+        <location filename="../src/gui/folder.cpp" line="510"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 został uaktualniony.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="512"/>
+        <location filename="../src/gui/folder.cpp" line="517"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 zmienił nazwę na %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="519"/>
+        <location filename="../src/gui/folder.cpp" line="524"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 został przeniesiony do %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="489"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="496"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="503"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="510"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="517"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="524"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="526"/>
+        <location filename="../src/gui/folder.cpp" line="531"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
-        <translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="531"/>
+        <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><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="533"/>
+        <location filename="../src/gui/folder.cpp" line="538"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="539"/>
+        <location filename="../src/gui/folder.cpp" line="544"/>
        <source>Sync Activity</source>
        <translation>Aktywności synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="750"/>
        <source>Could not read system exclude file</source>
        <translation>Nie można przeczytać pliku wyłączeń</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="961"/>
        <source>A new folder larger than %1 MB has been added: %2.
 Please go in the settings to select it if you wish to download it.</source>
        <translation>Nowy folder większy od %1 MB został dodany
 Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="979"/>
        <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>
@@ -700,22 +700,22 @@ Może to być spowodowane faktem, że folder został przekonfigurowany lub wszys
 Czy jesteś pewien, że chcesz wykonać tę operację ?	</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="983"/>
        <source>Remove All Files?</source>
        <translation>Usunąć wszystkie pliki?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="985"/>
        <source>Remove all files</source>
        <translation>Usuń wszystkie pliki</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Keep files</source>
        <translation>Pozostaw pliki</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1004"/>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Być może została przywrócona kopia zapasowa serwera?
 Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwotny stan. Czy chcesz zatrzymać swoje ostatnie pliki i nadać im status konfliktu?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Backup detected</source>
        <translation>Wykryto kopię zapasową.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1011"/>
        <source>Normal Synchronisation</source>
        <translation>Normalna synchronizacja.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
    </message>
@@ -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="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Dodaj folder połączenia synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <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="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <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="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Dodaj zdalny katalog</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <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="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <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="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <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="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <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="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <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="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Ten katalog jest już synchronizowany.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <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="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <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="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <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>
@@ -1380,27 +1380,27 @@ Pozycje, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawn
 <context>
    <name>OCC::NSISUpdater</name>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="331"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="329"/>
        <source>New Version Available</source>
        <translation>Nowa wersja dostępna</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="337"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="335"/>
        <source>&lt;p&gt;A new version of the %1 Client is available.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; is available for download. The installed version is %3.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Nowa wersja klienta %1 jest dostępna.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt;jest dostępna do pobrania. Zainstalowana wersja to %3.&lt;p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="348"/>
        <source>Skip this version</source>
        <translation>Pomiń tą wersję</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="351"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="349"/>
        <source>Skip this time</source>
        <translation>Pomiń tym razem</translation>
    </message>
    <message>
-        <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
+        <location filename="../src/gui/updater/ocupdater.cpp" line="350"/>
        <source>Get update</source>
        <translation>Uaktualnij</translation>
    </message>
@@ -1902,7 +1902,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="103"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="101"/>
        <source>Connection Timeout</source>
        <translation>Limit czasu połączenia</translation>
    </message>
@@ -1910,7 +1910,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="160"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="158"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1956,17 +1956,17 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <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="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2100,48 +2100,48 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="297"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Usunięto plik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="309"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="321"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="710"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="637"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <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="645"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <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="676"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="699"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <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="725"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <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="800"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2184,17 +2184,17 @@ Niezalecane jest jego użycie.</translation>
        <translation>Rozmiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Lokalny protokół synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopiuj</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiuj listę aktywności do schowka.</translation>
    </message>
@@ -2481,7 +2481,7 @@ Niezalecane jest jego użycie.</translation>
        <translation>Współdziel z użytkownikami lub grupami</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
        <source>No results for &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
@@ -2514,17 +2514,17 @@ Niezalecane jest jego użycie.</translation>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
        <source>create</source>
        <translation>utwórz</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
        <source>change</source>
        <translation>zmiany</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
        <source>delete</source>
        <translation>skasuj</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="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Uwierzytelnienia</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Wymagana powtórna autoryzacja</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <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>
@@ -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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <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="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <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="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <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="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <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="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <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="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <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="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <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="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <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="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Nazwa pliku zbyt długa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Błąd statystyk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <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="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <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="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <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="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <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="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <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="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <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="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -3502,7 +3502,7 @@ Kliknij</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="581"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -3510,37 +3510,37 @@ Kliknij</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="473"/>
+        <location filename="../src/libsync/utility.cpp" line="468"/>
        <source>in the future</source>
        <translation>w przyszłości</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="469"/>
+        <location filename="../src/libsync/utility.cpp" line="464"/>
        <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="477"/>
+        <location filename="../src/libsync/utility.cpp" line="472"/>
        <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="482"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>now</source>
        <translation>teraz</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="484"/>
+        <location filename="../src/libsync/utility.cpp" line="479"/>
        <source>Less than a minute ago</source>
        <translation>Mniej niż minutę temu</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="487"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <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="490"/>
+        <location filename="../src/libsync/utility.cpp" line="485"/>
        <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 numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <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>
+        <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="348"/>
+        <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>
+        <location filename="../src/libsync/utility.cpp" line="319"/>
+        <source>%Ln second(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/utility.cpp" line="343"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
--- a/Mostrar Mais
+++ b/Mostrar Mais