v2.2.1

Update ChangeLog
Fix memleak in updater
2016-06-06 10:50:02 +02:00 · 2016-06-06 10:49:29 +02:00 · 2016-06-02 15:03:52 +02:00 · 2016-06-01 02:19:17 -04:00 · 2016-05-31 10:26:52 +02:00 · 2016-05-31 09:46:52 +02:00
@@ -1,15 +1,21 @@
+sudo: required
+
 language: cpp
+
+services:
+  - docker
+
 branches:
  only:
  - coverity_scan 

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

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

+# When this option is enabled, a rename that is not allowed will be renamed back
+# do the original as a restoration step.  Withut this option, the restoration will
+# re-download the file instead.
+# The default is off because we don't want to rename the files back behind the user's back
+# Added for IL issue #550
+option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF)
+if(OWNCLOUD_RESTORE_RENAME)
+    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
+endif()
+
+
 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
@@ -1,5 +1,41 @@
 ChangeLog
 =========
+version 2.2.1 (release 2016-06-06)
+ * 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
+ * Several fixes to speed up reconnect after connection changes
+ * Updater: Fix small memory leak
+ * Linux: Revert forced HiDPI detection settings (#4840, #4861)
+
+version 2.2.0 (release 2016-05-12)
+ * Overlay icons: Refactoring - mainly for performance improvements
+ * Improved error handling with Sync Journal on USB storages (#4632)
+ * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
+ * Show server notifications on the client (#3733)
+ * Improved Speed with small files by dynamic parallel request count (#4529)
+ * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
+ * Improved handling of Win32 file locks and network files
+ * Workaround Ubuntu 16.04 tray icon bug (#4693)
+ * Removed the Alias field from the folder definition (#4695)
+ * Improved netrc parser (#4691)
+ * Improved user notifications about ignored files and conflicts (#4761, #3222)
+ * Add warnings for old server versions (#4523)
+ * Enable tranportation checksums if the server supports based on server capabilities (#3735)
+
+ * Default Chunk-size changed to 10MB (#4354)
+ * Documentation Improvements, ie. about overlay icons
+ * Translation fixes
+ * Countless other bugfixes
+ * Sqlite Update to recent version
+ * Update of QtKeyChain to support Windows credential store
+ * Packaging of dolphin overlay icon module for bleeding edge distros
+
 version 2.1.1 (release 2016-02-10)
 * UI improvements for HiDPI screens, error messages, RTL languages
 * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 2 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -1,7 +1,7 @@
 ## Patches used

 There are our patches on top of Qt 5.4.0, which we are currently
-using for our binary packages on Windows and Mac OS. Most of them
+using for our binary packages on Windows and Mac OS X. Most of them
 have been sent upstream and are part of newer Qt releases.

 All changes are designed to up upstream, and all those that are
@@ -28,18 +28,26 @@ purpose is outlined in each patches' front matter.
 * 0007-X-Network-Fix-up-previous-corruption-patch.patch
 * 0008-QNAM-Fix-reply-deadlocks-on-server-closing-connectio.patch
 * 0014-Fix-SNI-for-TlsV1_0OrLater-TlsV1_1OrLater-and-TlsV1_.patch
+* 0016-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
+* 0011-Make-sure-to-report-correct-NetworkAccessibility.patch

-### Upstreamed but not in any release yet (as of 2015-11-16)
+### Part of Qt v5.5.2 (UNRELEASED!)
+* 0009-QNAM-Assign-proper-channel-before-sslErrors-emission.patch
+* 0010-Don-t-let-closed-http-sockets-pass-as-valid-connecti.patch
+* 0012-Make-sure-networkAccessibilityChanged-is-emitted.patch
+
+### Part of Qt v5.6 and later
 * 0009-QNAM-Assign-proper-channel-before-sslErrors-emission.patch
 * 0010-Don-t-let-closed-http-sockets-pass-as-valid-connecti.patch
 * 0011-Make-sure-to-report-correct-NetworkAccessibility.patch
 * 0012-Make-sure-networkAccessibilityChanged-is-emitted.patch
 * 0013-Make-UnknownAccessibility-not-block-requests.patch
-* 0015-Remove-legacy-platform-code-in-QSslSocket-for-OS-X-1.patch
-* 0016-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
 * 0019-Ensure-system-tray-icon-is-prepared-even-when-menu-bar.patch

-### Not submitted to be part of any release:
+### Part of Qt 5.7 and later
+* 0015-Remove-legacy-platform-code-in-QSslSocket-for-OS-X-1.patch
+
+### Not submitted upstream to be part of any release:
 * 0006-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
 This is only needed if you intent to harvest debugging symbols
 for breakpad.
@@ -1,5 +0,0 @@
--- binary
-+++ binary
-@@ -1 +1 @@
-Subproject commit 1fb9ddfa9a9a1b4dbc447eee10dbed89172d968a
-+Subproject commit 01d73965dc8b862d1b2310d3ef801c297b697ec7
@@ -620,7 +620,6 @@ Section Uninstall
        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays_x64.dll"
        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil_x64.dll"
        !undef LIBRARY_X64
-     ${Else}
        DetailPrint "Uninstalling x86 overlay DLLs"
        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu_x86.dll"
        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays_x86.dll"
@@ -270,6 +270,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


 # Translations
-Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-GenericName[sq]=Njëkohësim Dosjesh
-Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-Icon[sq]=@APPLICATION_EXECUTABLE@
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[oc]=@APPLICATION_EXECUTABLE@
+Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+GenericName[ca]=Sincronització de carpetes
+Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
+Icon[ca]=@APPLICATION_EXECUTABLE@
+Comment[da]=@APPLICATION_NAME@ skrivebordsklient til synkronisering
+GenericName[da]=Mappesynkronisering
+Name[da]=@APPLICATION_NAME@ skrivebordsklient til synk
+Icon[da]=@APPLICATION_EXECUTABLE@
+Comment[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de]=Ordner-Synchronisation
+Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de]=@APPLICATION_EXECUTABLE@
+Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
+GenericName[en_GB]=Folder Sync
+Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
+Icon[en_GB]=@APPLICATION_EXECUTABLE@
+Comment[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+GenericName[es]=Sincronización de carpeta
+Name[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
+Icon[es]=@APPLICATION_EXECUTABLE@
+Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+GenericName[de_DE]=Ordner-Synchronisation
+Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
+Icon[de_DE]=@APPLICATION_EXECUTABLE@
+Comment[fr]=@APPLICATION_NAME@ synchronisation du client
+GenericName[fr]=Dossier de Synchronisation
+Name[fr]=@APPLICATION_NAME@ synchronisation du client
+Icon[fr]=@APPLICATION_EXECUTABLE@
+Comment[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[nl]=@APPLICATION_NAME@ desktop synchronisatie client
 GenericName[nl]=Mappen sync
 Name[nl]=@APPLICATION_NAME@ desktop sync client 
 Icon[nl]=@APPLICATION_EXECUTABLE@
+Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
+GenericName[bg_BG]=Синхронизиране на папката
+Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
+Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização do computador
+GenericName[pt_BR]=Sincronização de Pasta
+Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização de desktop
+Icon[pt_BR]=@APPLICATION_EXECUTABLE@
+Comment[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+GenericName[cs_CZ]=Synchronizace adresáře
+Name[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
+Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
+Comment[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@ 
+GenericName[ru]=Синхронизация папки
+Name[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@
+Icon[ru]=@ВЫПОЛНЯЕМОЕ_ПРИЛОЖЕНИЕ@
+Comment[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+GenericName[sl]=Usklajevanje map
+Name[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
+Icon[sl]=@APPLICATION_EXECUTABLE@
+Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+GenericName[sq]=Njëkohësim Dosjesh
+Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
+Icon[sq]=@APPLICATION_EXECUTABLE@
+Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+GenericName[ja_JP]=フォルダ同期
+Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+Comment[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+GenericName[ro]=Sincronizare director
+Name[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
+Icon[ro]=@APPLICATION_EXECUTABLE@
+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 ambiente de trabalho
+GenericName[pt_PT]=Sincronizar Pasta
+Name[pt_PT]=@APPLICATION_NAME@ cliente de sincronização para ambiente de trabalho
+Icon[pt_PT]=@APPLICATION_EXECUTABLE@
+Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
+Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
+Icon[th_TH]=@APPLICATION_EXECUTABLE@
@@ -36,7 +36,7 @@ endif()
 set(OWNCLOUDDOLPHINHELPER ${APPLICATION_EXECUTABLE}dolphinpluginhelper)
 add_library(${OWNCLOUDDOLPHINHELPER} SHARED ownclouddolphinpluginhelper.cpp)
 target_link_libraries(${OWNCLOUDDOLPHINHELPER} Qt5::Network)
-generate_export_header(${OWNCLOUDDOLPHINHELPER})
+generate_export_header(${OWNCLOUDDOLPHINHELPER} BASE_NAME ownclouddolphinpluginhelper)
 install(TARGETS ${OWNCLOUDDOLPHINHELPER} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

 #---OVERLAY PLUGIN---
@@ -21,11 +21,15 @@ import socket

 from gi.repository import GObject, Nautilus

-print("Initializing owncloud-client-nautilus extension")
-
-# Do not touch the following line.
+# Please do not touch the following line.
+# The reason is that we use a script to adopt this file for branding
+# by replacing this line with the branding app name. If the following
+# line is changed, the script can not match the pattern and fails.
 appname = 'ownCloud'

+print("Initializing "+appname+"-client-nautilus extension")
+
+
 def get_local_path(url):
    if url[0:7] == 'file://':
        url = url[7:]
@@ -181,10 +185,10 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
        if not syncedFile:
            return items

-        # Create an menu item
+        # Create a menu item
        labelStr = "Share with " + appname + "..."
        item = Nautilus.MenuItem(name='NautilusPython::ShareItem', label=labelStr,
-                tip='Share file %s through ownCloud' % file.get_name())
+                tip='Share file {} through {}'.format(file.get_name(), appname) )
        item.connect("activate", self.menu_share, file)
        items.append(item)

@@ -36,8 +36,7 @@ using namespace std;

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

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

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

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

 #include <fstream> 

-#define BUFSIZE 1024
+#define DEFAULT_BUFLEN 4096

 using namespace std;

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

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

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

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

 using namespace std;

-#define BUFSIZE 512
-
-std::wstring getUserName() {
-    DWORD  len = BUFSIZE;
-    TCHAR  buf[BUFSIZE];
-    if (GetUserName(buf, &len)) {
-        return std::wstring(&buf[0], len);
-    } else {
-        return std::wstring();
-    }
-}
-
 // This code is run in a thread
 void RemotePathChecker::workerThreadLoop()
 {
-    auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud\\";
-    pipename += getUserName();
-
+    auto pipename = CommunicationSocket::DefaultPipePath();
    bool connected = false;
    CommunicationSocket socket;
    std::unordered_set<std::wstring> asked;
@@ -28,16 +28,12 @@
 * \return string PEM
 */
 string x509ToString(BIO *o) {
-    int len = 0;
    BUF_MEM *bptr;
-    void* data;
-    string ret = "";
-    
    BIO_get_mem_ptr(o, &bptr);
-    len = bptr->length;
-    data = calloc(len+10, sizeof(char));
+    int len = bptr->length;
+    void* data = calloc(len+10, sizeof(char));
    BIO_read(o, data, len);
-    ret = strdup((char*)data);
+    string ret = std::string(static_cast<char*>(data));
    free(data);
        
    return ret;
@@ -95,6 +95,9 @@ void AccountState::setState(State state)
        } else if (oldState == SignedOut && _state == Disconnected) {
            checkConnectivity();
        }
+        if (oldState == Connected || _state == Connected) {
+            emit isConnectedChanged();
+        }
    }

    // might not have changed but the underlying _connectionErrors might have
@@ -149,11 +152,6 @@ bool AccountState::isConnectedOrTemporarilyUnavailable() const
    return isConnected() || _state == ServiceUnavailable;
 }

-bool AccountState::canSync() const
-{
-    return isConnected();
-}
-
 void AccountState::tagLastSuccessfullETagRequest()
 {
    _timeSinceLastETagCheck.restart();
@@ -192,7 +190,8 @@ void AccountState::checkConnectivity()
    } else {
        // Check the server and then the auth.

-#ifdef Q_OS_WIN
+// 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
        // 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.
@@ -203,7 +202,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();
    }
 }
@@ -211,6 +210,7 @@ void AccountState::checkConnectivity()
 void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList& errors)
 {
    if (isSignedOut()) {
+        qDebug() << "Signed out, ignoring" << connectionStatusString(status) << _account->url().toString();
        return;
    }

@@ -102,9 +102,6 @@ public:
    bool isConnected() const;
    bool isConnectedOrTemporarilyUnavailable() const;

-    /// Returns whether sync actions are allowed to run.
-    bool canSync() const;
-
    /// Triggers a ping to the server to update state and
    /// connection status and errors.
    void checkConnectivity();
@@ -130,6 +127,7 @@ private:

 signals:
    void stateChanged(int state);
+    void isConnectedChanged();

 protected Q_SLOTS:
    void slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList& errors);
@@ -38,7 +38,12 @@ namespace OCC

 class UserAgentWebPage : public QWebPage {
 public:
-    UserAgentWebPage(QObject *parent) : QWebPage(parent) {}
+    UserAgentWebPage(QObject *parent) : QWebPage(parent)
+    {
+        if (!qgetenv("OWNCLOUD_SHIBBOLETH_DEBUG").isEmpty()) {
+            settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        }
+    }
    QString userAgentForUrl(const QUrl &url ) const {
        return QWebPage::userAgentForUrl(url) + " " + Utility::userAgentString();
    }
@@ -96,6 +96,7 @@ Folder::Folder(const FolderDefinition& definition,
    if (!setIgnoredFiles())
        qWarning("Could not read system exclude file");

+    connect(_accountState.data(), SIGNAL(isConnectedChanged()), this, SIGNAL(canSyncChanged()));
    connect(_engine.data(), SIGNAL(rootEtag(QString)), this, SLOT(etagRetreivedFromSyncEngine(QString)));
    connect(_engine.data(), SIGNAL(treeWalkResult(const SyncFileItemVector&)),
              this, SLOT(slotThreadTreeWalkResult(const SyncFileItemVector&)), Qt::QueuedConnection);
@@ -230,7 +231,7 @@ bool Folder::syncPaused() const

 bool Folder::canSync() const
 {
-    return !syncPaused() && accountState()->canSync();
+    return !syncPaused() && accountState()->isConnected();
 }

 void Folder::setSyncPaused( bool paused )
@@ -249,6 +250,7 @@ void Folder::setSyncPaused( bool paused )
    }
    emit syncPausedChanged(this, paused);
    emit syncStateChange();
+    emit canSyncChanged();
 }

 void Folder::setSyncState(SyncResult::Status state)
@@ -318,6 +320,7 @@ 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);
@@ -686,7 +689,8 @@ void Folder::wipe()
    QFile::remove( stateDbFile + "-wal" );
    QFile::remove( stateDbFile + "-journal" );

-    FolderMan::instance()->socketApi()->slotRegisterPath(alias());
+    if (canSync())
+        FolderMan::instance()->socketApi()->slotRegisterPath(alias());
 }

 bool Folder::setIgnoredFiles()
@@ -912,7 +916,7 @@ void Folder::slotFolderDiscovered(bool, QString folderName)
 // and hand the result over to the progress dispatcher.
 void Folder::slotTransmissionProgress(const ProgressInfo &pi)
 {
-    if( !pi.hasStarted() ) {
+    if( !pi.isUpdatingEstimates() ) {
        // this is the beginning of a sync, set the warning level to 0
        _syncResult.setWarnCount(0);
    }
@@ -131,8 +131,6 @@ public:

    /**
     * Returns true when the folder may sync.
-     *
-     * !syncPaused() && accountState->canSync().
     */
    bool canSync() const;

@@ -203,6 +201,7 @@ signals:
    void progressInfo(const ProgressInfo& progress);
    void newBigFolderDiscovered(const QString &); // A new folder bigger than the threshold was discovered
    void syncPausedChanged(Folder*, bool paused);
+    void canSyncChanged();

    /**
     * Fires for each change inside this folder that wasn't caused
@@ -157,7 +157,8 @@ void FolderMan::registerFolderMonitor( Folder *folder )
    }

    // register the folder with the socket API
-    _socketApi->slotRegisterPath(folder->alias());
+    if (folder->canSync())
+        _socketApi->slotRegisterPath(folder->alias());
 }

 void FolderMan::addMonitorPath( const QString& alias, const QString& path )
@@ -427,6 +428,17 @@ void FolderMan::slotFolderSyncPaused( Folder *f, bool paused )
    }
 }

+void FolderMan::slotFolderCanSyncChanged()
+{
+    Folder *f = qobject_cast<Folder*>(sender());
+    Q_ASSERT(f);
+    if (f->canSync()) {
+        _socketApi->slotRegisterPath(f->alias());
+    } else {
+        _socketApi->slotUnregisterPath(f->alias());
+    }
+}
+
 // this really terminates the current sync process
 // ie. no questions, no prisoners
 // csync still remains in a stable state, regardless of that.
@@ -549,7 +561,7 @@ void FolderMan::slotAccountStateChanged()
    }
    QString accountName = accountState->account()->displayName();

-    if (accountState->canSync()) {
+    if (accountState->isConnected()) {
        qDebug() << "Account" << accountName << "connected, scheduling its folders";

        foreach (Folder *f, _folderMap.values()) {
@@ -820,6 +832,7 @@ Folder* FolderMan::addFolderInternal(FolderDefinition folderDefinition, AccountS
    connect(folder, SIGNAL(syncFinished(SyncResult)), SLOT(slotFolderSyncFinished(SyncResult)));
    connect(folder, SIGNAL(syncStateChange()), SLOT(slotForwardFolderSyncStateChange()));
    connect(folder, SIGNAL(syncPausedChanged(Folder*,bool)), SLOT(slotFolderSyncPaused(Folder*,bool)));
+    connect(folder, SIGNAL(canSyncChanged()), SLOT(slotFolderCanSyncChanged()));
    connect(&folder->syncEngine().syncFileStatusTracker(), SIGNAL(fileStatusChanged(const QString &, SyncFileStatus)),
            _socketApi.data(), SLOT(slotFileStatusChanged(const QString &, SyncFileStatus)));
    connect(folder, SIGNAL(watchedFileChangedExternally(QString)),
@@ -144,6 +144,7 @@ signals:
 public slots:
    void slotRemoveFolder( Folder* );
    void slotFolderSyncPaused(Folder *, bool paused);
+    void slotFolderCanSyncChanged();

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

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

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

 void FolderWizardSelectiveSync::cleanupPage()
 {
-    QString alias        = wizard()->field(QLatin1String("alias")).toString();
    QString targetPath   = wizard()->property("targetPath").toString();
+    QString alias        = QFileInfo(targetPath).fileName();
+    if (alias.isEmpty())
+        alias = Theme::instance()->appName();
    _treeView->setFolderInfo(targetPath, alias);
    QWizardPage::cleanupPage();
 }
@@ -53,9 +53,7 @@ int main(int argc, char **argv)
    // 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
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-    qputenv("QT_DEVICE_PIXEL_RATIO", "auto");
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
    qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
 #endif
 #endif // !Q_OS_MAC
@@ -685,7 +685,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo&
        slotRebuildRecentMenus();
    }

-    if (progress.hasStarted()
+    if (progress.isUpdatingEstimates()
            && progress.completedFiles() >= progress.totalFiles()
            && progress._currentDiscoveredFolder.isEmpty()) {
        QTimer::singleShot(2000, this, SLOT(slotDisplayIdle()));
@@ -173,7 +173,7 @@ void OwncloudSetupWizard::slotNoOwnCloudFoundAuth(QNetworkReply *reply)

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

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

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

 void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo& progress )
 {
-    if( !progress.hasStarted() ) {
+    if( !progress.isUpdatingEstimates() ) {
        // The sync is restarting, clean the old items
        cleanItems(folder);
    } else if (progress.completedFiles() >= progress.totalFiles()) {
@@ -72,9 +72,7 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,

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

    _manager = new ShareManager(_account, this);
@@ -56,6 +56,13 @@
 // The second number should be changed when there are new features.
 #define MIRALL_SOCKET_API_VERSION "1.0"

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

 #define DEBUG qDebug() << "SocketApi: "
@@ -141,8 +148,10 @@ void SocketApi::slotNewConnection()
    _listeners.append(socket);

    foreach( Folder *f, FolderMan::instance()->map() ) {
-        QString message = buildRegisterPathMessage(f->path());
-        sendMessage(socket, message);
+        if (f->canSync()) {
+            QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
+            sendMessage(socket, message);            
+        }
    }
 }

@@ -181,20 +190,31 @@ void SocketApi::slotReadSocket()

 void SocketApi::slotRegisterPath( const QString& alias )
 {
+    // Make sure not to register twice to each connected client
+    if (_registeredAliases.contains(alias))
+        return;
+
    Folder *f = FolderMan::instance()->folder(alias);
    if (f) {
-        QString message = buildRegisterPathMessage(f->path());
+        QString message = buildRegisterPathMessage(removeTrailingSlash(f->path()));
        foreach(QIODevice *socket, _listeners) {
            sendMessage(socket, message);
        }
    }
+
+    _registeredAliases.insert(alias);
 }

 void SocketApi::slotUnregisterPath( const QString& alias )
 {
+    if (!_registeredAliases.contains(alias))
+        return;
+
    Folder *f = FolderMan::instance()->folder(alias);
    if (f)
-        broadcastMessage(QLatin1String("UNREGISTER_PATH"), f->path(), QString::null, true );
+        broadcastMessage(QLatin1String("UNREGISTER_PATH"), removeTrailingSlash(f->path()), QString::null, true );
+
+    _registeredAliases.remove(alias);
 }

 void SocketApi::slotUpdateFolderView(Folder *f)
@@ -212,10 +232,11 @@ void SocketApi::slotUpdateFolderView(Folder *f)
                f->syncResult().status() == SyncResult::Error   ||
                f->syncResult().status() == SyncResult::SetupError ) {

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

-            broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
+            broadcastMessage(QLatin1String("UPDATE_VIEW"), rootPath);
        } else {
            qDebug() << "Not sending UPDATE_VIEW for" << f->alias() << "because status() is" << f->syncResult().status();
        }
@@ -275,8 +296,6 @@ void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, QIODevic

 void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice* socket)
 {
-    const QString nopString("NOP");
-
    if( !socket ) {
        qDebug() << "No valid socket object.";
        return;
@@ -289,18 +308,16 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice*
    Folder* syncFolder = FolderMan::instance()->folderForPath( argument );
    if (!syncFolder) {
        // this can happen in offline mode e.g.: nothing to worry about
-        statusString = nopString;
+        statusString = QLatin1String("NOP");
    } else {
-        const QString file = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
-
-        // future: Send more specific states for paused, disconnected etc.
-        if( syncFolder->syncPaused() || !syncFolder->accountState()->isConnected() ) {
-            statusString = nopString;
-        } else {
-            SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(file);
-
-            statusString = fileStatus.toSocketAPIString();
+        QString relativePath = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
+        if( relativePath.endsWith(QLatin1Char('/')) ) {
+            relativePath.truncate(relativePath.length()-1);
+            qWarning() << "Removed trailing slash for directory: " << relativePath << "Status pushes won't have one.";
        }
+        SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(relativePath);
+
+        statusString = fileStatus.toSocketAPIString();
    }

    const QString message = QLatin1String("STATUS:") % statusString % QLatin1Char(':') %  QDir::toNativeSeparators(argument);
@@ -77,6 +77,7 @@ private:
    Q_INVOKABLE void command_SHARE_MENU_TITLE(const QString& argument, QIODevice* socket);
    QString buildRegisterPathMessage(const QString& path);

+    QSet<QString> _registeredAliases;
    QList<QIODevice*> _listeners;
    SocketApiServer _localServer;
 };
@@ -218,6 +218,7 @@ 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;
@@ -258,6 +259,7 @@ void NSISUpdater::slotWriteFile()
 void NSISUpdater::slotDownloadFinished()
 {
    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+    reply->deleteLater();
    if (reply->error() != QNetworkReply::NoError) {
        setDownloadState(DownloadFailed);
        return;
@@ -242,6 +242,7 @@ void AbstractNetworkJob::slotTimeout()
        reply()->abort();
    } else {
        qDebug() << Q_FUNC_INFO << this << "Timeout reply was NULL";
+        deleteLater();
    }
 }

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

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

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

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

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

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

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

    /** We detected that another sync is required after this one */
@@ -379,6 +384,12 @@ private:
    /** Stores the time since a job touched a file. */
    QHash<QString, QElapsedTimer> _touchedFiles;
    mutable QMutex _touchedFilesMutex;
+
+#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,27 +127,65 @@ void ProgressDispatcher::setProgressInfo(const QString& folder, const ProgressIn
    emit progressInfo( folder, progress );
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 }

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

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

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

-#if 0 /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
-
-                if (!sourceOK && !destinationOK) {
+#ifdef OWNCLOUD_RESTORE_RENAME /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
+                if (!sourceOK && (!destinationOK || isRename)
+                        // (not for directory because that's more complicated with the contents that needs to be adjusted)
+                        && !(*it)->_isDirectory) {
                    // Both the source and the destination won't allow move.  Move back to the original
                    std::swap((*it)->_file, (*it)->_renameTarget);
                    (*it)->_direction = SyncFileItem::Down;
                    (*it)->_errorString = tr("Move not allowed, item restored");
                    (*it)->_isRestoration = true;
                    qDebug() << "checkForPermission: MOVING BACK" << (*it)->_file;
+                    // in case something does wrong, we will not do it next time
+                    _journal->avoidRenamesOnNextSync((*it)->_file);
                } else
 #endif
                if (!sourceOK || !destinationOK) {
@@ -1342,7 +1356,7 @@ SyncFileItem* SyncEngine::findSyncItem(const QString &fileName) const
 {
    Q_FOREACH(const SyncFileItemPtr &item, _syncedItems) {
        // Directories will appear in this list as well, and will get their status set once all children have been propagated
-        if ((item->_file == fileName || item->_renameTarget == fileName))
+        if ((item->_file == fileName || (!item->_renameTarget.isEmpty() && item->_renameTarget == fileName)))
            return item.data();
    }
    return 0;
@@ -28,14 +28,15 @@ static SyncFileStatus::SyncFileStatusTag lookupProblem(const QString &pathToMatc
        // qDebug() << Q_FUNC_INFO << pathToMatch << severity << problemPath;
        if (problemPath == pathToMatch) {
            return severity;
-        } else if (severity == SyncFileStatus::StatusError && problemPath.startsWith(pathToMatch) && problemPath.at(pathToMatch.size()) == '/') {
-            Q_ASSERT(!pathToMatch.endsWith('/'));
+        } else if (severity == SyncFileStatus::StatusError
+                && problemPath.startsWith(pathToMatch)
+                && (pathToMatch.isEmpty() || problemPath.at(pathToMatch.size()) == '/')) {
            return SyncFileStatus::StatusWarning;
        } else if (!problemPath.startsWith(pathToMatch)) {
            // Starting at lower_bound we get the first path that is not smaller,
-            // since: "/a/" < "/a/aa" < "/a/aa/aaa" < "/a/ab/aba"
-            // If problemMap keys are ["/a/aa/aaa", "/a/ab/aba"] and pathToMatch == "/a/aa",
-            // lower_bound(pathToMatch) will point to "/a/aa/aaa", and the moment that
+            // since: "a/" < "a/aa" < "a/aa/aaa" < "a/ab/aba"
+            // If problemMap keys are ["a/aa/aaa", "a/ab/aba"] and pathToMatch == "a/aa",
+            // lower_bound(pathToMatch) will point to "a/aa/aaa", and the moment that
            // problemPath.startsWith(pathToMatch) == false, we know that we've looked
            // at everything that interest us.
            break;
@@ -68,95 +69,64 @@ static inline bool showWarningInSocketApi(const SyncFileItem& item)
        || status == SyncFileItem::Restoration;
 }

-static inline bool showSyncInSocketApi( const SyncFileItem& item)
-{
-    const auto inst = item._instruction;
-    return inst == CSYNC_INSTRUCTION_NEW;
-}
-
 SyncFileStatusTracker::SyncFileStatusTracker(SyncEngine *syncEngine)
    : _syncEngine(syncEngine)
 {
    connect(syncEngine, SIGNAL(aboutToPropagate(SyncFileItemVector&)),
-              this, SLOT(slotAboutToPropagate(SyncFileItemVector&)));
+            SLOT(slotAboutToPropagate(SyncFileItemVector&)));
    connect(syncEngine, SIGNAL(itemCompleted(const SyncFileItem&, const PropagatorJob&)),
-            this, SLOT(slotItemCompleted(const SyncFileItem&)));
-    connect(syncEngine, SIGNAL(started()),
-            SLOT(slotClearDirtyPaths()));
+            SLOT(slotItemCompleted(const SyncFileItem&)));
+    connect(syncEngine, SIGNAL(started()), SLOT(slotClearDirtyPaths()));
+    connect(syncEngine, SIGNAL(started()), SLOT(slotSyncEngineRunningChanged()));
+    connect(syncEngine, SIGNAL(finished(bool)), SLOT(slotSyncEngineRunningChanged()));
 }

-SyncFileStatus SyncFileStatusTracker::rootStatus()
+SyncFileItem SyncFileStatusTracker::rootSyncFileItem()
 {
-    /* Possible values for the status:
-    enum SyncFileStatusTag {
-        StatusNone,
-        StatusSync,
-        StatusWarning,
-        StatusUpToDate,
-        StatusError,
-    };
-    */
-    SyncFileStatus status =  SyncFileStatus::StatusUpToDate;
-
-    if( !_syncEngine ) return SyncFileStatus::StatusNone;
-
-    if( _syncEngine->isSyncRunning() ) {
-        status = SyncFileStatus::StatusSync;
-    } else {
-        // sync is not running. Check dirty list and _syncProblems
-        int errs = 0;
-        for (auto it = _syncProblems.begin(); it != _syncProblems.end(); ++it) {
-            if( it->second == SyncFileStatus::StatusError ) {
-                errs ++;
-                break; // stop if an error found at all.
-            }
-        }
-        if( errs ) {
-            status = SyncFileStatus::StatusWarning; // some files underneath had errors
-        }
-        // Only warnings do not change the root emblem away from ok.
-    }
-    return status;
-
+    SyncFileItem fakeRootItem;
+    // It's is not entirely correct to use the sync's status as we'll show the root folder as
+    // syncing even though no child might end up being propagated, but will give us something
+    // better than always UpToDate for now.
+    fakeRootItem._status = _syncEngine->isSyncRunning() ? SyncFileItem::NoStatus : SyncFileItem::Success;
+    fakeRootItem._isDirectory = true;
+    return fakeRootItem;
 }

-SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& systemFileName)
+SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
 {
-    QString fileName = systemFileName.normalized(QString::NormalizationForm_C);
-    if( fileName.endsWith(QLatin1Char('/')) ) {
-        fileName.truncate(fileName.length()-1);
-        qDebug() << "Removed trailing slash: " << fileName;
+    // normalization is required for OS X to match file names properly
+    QString normalizedRelativePath = relativePath.normalized(QString::NormalizationForm_C);
+    Q_ASSERT(!normalizedRelativePath.endsWith(QLatin1Char('/')));
+
+    if (normalizedRelativePath.isEmpty()) {
+        // This is the root sync folder, it doesn't have an entry in the database and won't be walked by csync, so create one manually.
+        return syncFileItemStatus(rootSyncFileItem());
    }

-    if( fileName.isEmpty() ) {
-        // this is the root sync folder.
-        return rootStatus();
-
-    }
    // The SyncEngine won't notify us at all for CSYNC_FILE_SILENTLY_EXCLUDED
    // and CSYNC_FILE_EXCLUDE_AND_REMOVE excludes. Even though it's possible
    // that the status of CSYNC_FILE_EXCLUDE_LIST excludes will change if the user
    // update the exclude list at runtime and doing it statically here removes
    // our ability to notify changes through the fileStatusChanged signal,
    // it's an acceptable compromize to treat all exclude types the same.
-    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + fileName,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + normalizedRelativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

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

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

    // If we're not currently syncing that file, look it up in the database to know if it's shared
-    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(fileName);
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(normalizedRelativePath);
    if (rec.isValid()) {
-        return fileStatus(rec.toSyncFileItem());
+        return syncFileItemStatus(rec.toSyncFileItem());
    }
    // Must be a new file, wait for the filesystem watcher to trigger a sync
    return SyncFileStatus();
@@ -185,10 +155,8 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
            _syncProblems[item->_file] = SyncFileStatus::StatusError;
        } else if (showWarningInSocketApi(*item)) {
            _syncProblems[item->_file] = SyncFileStatus::StatusWarning;
-        } else if( showSyncInSocketApi(*item)) {
-            _syncProblems[item->_file] = SyncFileStatus::StatusSync;
        }
-        emit fileStatusChanged(getSystemDestination(*item), fileStatus(*item));
+        emit fileStatusChanged(getSystemDestination(item->destination()), syncFileItemStatus(*item));
    }

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

@@ -213,15 +181,16 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
        invalidateParentPaths(item.destination());
    } else if (showWarningInSocketApi(item)) {
        _syncProblems[item._file] = SyncFileStatus::StatusWarning;
-    } else if (showSyncInSocketApi(item)) {
-        // new items that were in state sync can now be erased
-        _syncProblems.erase(item._file);
    } else {
-        // There is currently no situation where an error status set during discovery/update is fixed by propagation.
-        Q_ASSERT(_syncProblems.find(item._file) == _syncProblems.end());
+        _syncProblems.erase(item._file);
    }

-    emit fileStatusChanged(getSystemDestination(item), fileStatus(item));
+    emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));
+}
+
+void SyncFileStatusTracker::slotSyncEngineRunningChanged()
+{
+    emit fileStatusChanged(_syncEngine->localPath(), syncFileItemStatus(rootSyncFileItem()));
 }

 void SyncFileStatusTracker::slotClearDirtyPaths()
@@ -231,11 +200,13 @@ void SyncFileStatusTracker::slotClearDirtyPaths()
    _dirtyPaths.clear();
 }

-SyncFileStatus SyncFileStatusTracker::fileStatus(const SyncFileItem& item)
+SyncFileStatus SyncFileStatusTracker::syncFileItemStatus(const SyncFileItem& item)
 {
    // Hack to know if the item was taken from the sync engine (Sync), or from the database (UpToDate)
-    bool waitingForPropagation = item._direction != SyncFileItem::None && item._status == SyncFileItem::NoStatus;
-
+    // Mark any directory in the SyncEngine's items as syncing, this is currently how we mark parent directories
+    // of currently syncing items since the PropagateDirectory job will mark the directorie's SyncFileItem::_status as Success
+    // once all child jobs have been completed.
+    bool waitingForPropagation = (item._isDirectory || item._direction != SyncFileItem::None) && item._status == SyncFileItem::NoStatus;
    SyncFileStatus status(SyncFileStatus::StatusUpToDate);
    if (waitingForPropagation) {
        status.set(SyncFileStatus::StatusSync);
@@ -262,20 +233,19 @@ void SyncFileStatusTracker::invalidateParentPaths(const QString& path)
    QStringList splitPath = path.split('/', QString::SkipEmptyParts);
    for (int i = 0; i < splitPath.size(); ++i) {
        QString parentPath = QStringList(splitPath.mid(0, i)).join(QLatin1String("/"));
-        emit fileStatusChanged(_syncEngine->localPath() + parentPath, fileStatus(parentPath));
+        emit fileStatusChanged(getSystemDestination(parentPath), fileStatus(parentPath));
    }
 }

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

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

 public slots:
    void slotPathTouched(const QString& fileName);
@@ -46,14 +46,15 @@ signals:
 private slots:
    void slotAboutToPropagate(SyncFileItemVector& items);
    void slotItemCompleted(const SyncFileItem& item);
+    void slotSyncEngineRunningChanged();
    void slotClearDirtyPaths();

 private:
-    SyncFileStatus fileStatus(const SyncFileItem& item);
-    SyncFileStatus rootStatus();
+    SyncFileStatus syncFileItemStatus(const SyncFileItem& item);
+    SyncFileItem rootSyncFileItem();

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

    SyncEngine* _syncEngine;

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

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

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

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

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

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

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

    QString    _file;
+    QString    _renameTarget;

    bool isValid() const;

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

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

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

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

 };

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

 };

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

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

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

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

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

 };

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

 };

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

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

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

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

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

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

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

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

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

 };

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

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

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

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

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

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

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

 };

-QTEST_MAIN(TestXmlParse)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestXmlParse)
+#else
+    QTEST_GUILESS_MAIN(TestXmlParse)
+#endif
+
 #include "testxmlparse.moc"
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Abgemeldet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Getrennt</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Verbunden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Dienst nicht verfügbar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Netzwerkfehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Konfigurationsfehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Unbekannten Konto-Zustand</translation>
    </message>
@@ -579,118 +579,118 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Lokale Konfliktdateien behalten</translation>
    </message>
@@ -741,112 +741,112 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(Sicherung)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(Sicherung %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Undefinierter Zustand.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Wartet auf Beginn der Synchronistation</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisation wird vorbereitet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Synchronisation läuft.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Die letzte Synchronisation war erfolgreich.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Installationsfehler.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Benutzer-Abbruch</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Synchronisation wurde angehalten.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisation ist pausiert)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Kein gültige Ordner gewählt!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Der gewählte Pfad ist kein Ordner!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 wird bereits als Synchronisationsordner benutzt. Bitte wählen Sie einen anderen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links beinhaltet schon einen Ordner, der in einer anderen Synchronisation liegt. Bitte wählen Sie einen anderen lokalen Ordner aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links liegt in einem Ordner, der schon synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
    </message>
@@ -1000,12 +1000,12 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
@@ -1023,7 +1023,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Pfad zum lokalen Verzeichnis eingeben</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Den Quellordner wählen</translation>
    </message>
@@ -1031,52 +1031,52 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Entfernten Ordner erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Geben Sie den Namen des neuen, unter &apos;%1&apos; zu erstellenden Ordners ein: </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Order erfolgreich auf %1 erstellt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Konnte Ordner nicht listen. Fehler: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Dieser Ordner wird bereits synchronisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird &lt;b&gt;nicht&lt;/b&gt; unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation.</translation>
    </message>
@@ -1084,7 +1084,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Zu synchronisierende Elemente auswählen: Sie können optional Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
    </message>
@@ -1954,17 +1954,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1  als Größe übermittelt hat.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Datei ist seit der Entdeckung geändert worden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2098,48 +2098,48 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT &lt; 5.4.2 wird erzwungen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2182,17 +2182,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokales Sychronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
    </message>
@@ -2404,32 +2404,32 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Link teilen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>&amp;password festlegen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Ablaufdatum setzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Passwort setzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>&amp;Link kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Bearbeitung erlauben</translation>
    </message>
@@ -2439,29 +2439,29 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Passwort geschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>passwortgeschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Öffentliches Teilen erfordert ein P&amp;asswort</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Bitte wählen Sie ein Passwort:</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Link teilen</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>Ändern</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifikation</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Erneute Authentifizierung erforderlich</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Ihre Sitzung ist abgelaufen. Sie müssen sich zur weiteren Nutzung des Clients neu Anmelden.</translation>
    </message>
@@ -2561,7 +2561,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Via %1 teilen</translation>
@@ -2855,23 +2855,23 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Fehler beim Lesen eines Ordners.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
    </message>
@@ -2891,7 +2891,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Dateiname enthält Zeichen die nicht auf allen Betriebssystemen dargestellt werden können.</translation>
    </message>
@@ -2931,109 +2931,109 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Ein interner Fehler mit der Fehlernummer %1  ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Die Datei ist in der Ignorierliste geführt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Der Dateiname ist zu lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Dateikodierung ist ungültig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ungültige Zeichenm bitte benennen Sie &quot;%1&quot; um</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3507,37 +3507,37 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>in der Zukunft</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>jetzt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>vor weniger als einer Minute</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>vor einiger Zeit</translation>
    </message>
@@ -3564,38 +3564,38 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln Jahr(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln Monat(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln Tag(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln Stunde(n)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln Minute(n)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln Sekunde(n)</translation>
+        <source>%n year(s)</source>
+        <translation><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>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Αποσύνδεση</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Αποσυνδεδεμένο</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Συνδεδεμένο</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Σφάλμα δικτύου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Σφάλμα ρυθμίσεων</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Άγνωστη κατάσταση λογαριασμού</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 αφαιρέθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ληφθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>Το %1 έχει ενημερωθεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <source>%1 has been moved to %2.</source>
        <translation>Το %1 έχει μετακινηθεί στο %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <source>Sync Activity</source>
        <translation>Δραστηριότητα Συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <source>Remove All Files?</source>
        <translation>Αφαίρεση Όλων των Αρχείων;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Remove all files</source>
        <translation>Αφαίρεση όλων των αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="987"/>
        <source>Keep files</source>
        <translation>Διατήρηση αρχείων</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1005"/>
        <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="1010"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού &apos;%1&apos;, αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(αντίγραφο ασφαλείας)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(αντίγραοφ ασφαλέιας %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Απροσδιόριστη Κατάσταση.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Αναμονή έναρξης συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Προετοιμασία για συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Ο συγχρονισμός εκτελείται.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Σφάλμα Ρύθμισης.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Ματαίωση από Χρήστη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Παύση συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Παύση συγχρονισμού)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 χρησιμοποιείται ήδη σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχει ήδη ένα φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχεται ήδη σε φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
    </message>
@@ -999,12 +999,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
    </message>
@@ -1022,7 +1022,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Εισάγετε τη διαδρομή προς τον τοπικό φάκελο.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Επιλογή του φακέλου προέλευσης</translation>
    </message>
@@ -1030,52 +1030,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Εισάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου &lt;b&gt;δεν&lt;/b&gt; υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation>
    </message>
@@ -1083,7 +1083,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
    </message>
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2182,17 +2182,17 @@ It is not advisable to use it.</source>
        <translation>Μέγεθος</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
    </message>
@@ -2404,32 +2404,32 @@ It is not advisable to use it.</source>
        <translation>Διαμοιρασμός συνδέσμου</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Ορισμός &amp;κωδικού πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Ορισμός &amp;ημερομηνίας λήξης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Ορισμός κωδικού πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Αντιγραφή &amp;συνδέσμου</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Επιτρέπεται η επεξεργασία</translation>
    </message>
@@ -2439,29 +2439,29 @@ It is not advisable to use it.</source>
        <translation>Π&amp;ροστασία με κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Προστατευμένο με κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Ο δημόσιος &amp;διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Παρακαλούμε ορίστε Κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>Δ&amp;ιαμοιρασμός συνδέσμου</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>δημιουργία</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>αλλαγή</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Πιστοποίηση</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Απαιτείται επανάληψη πιστοποίησης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation>
    </message>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Διαμοιρασμός με %1</translation>
@@ -2855,23 +2855,23 @@ It is not advisable to use it.</source>
        <translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
    </message>
@@ -2891,7 +2891,7 @@ It is not advisable to use it.</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
    </message>
@@ -2931,109 +2931,109 @@ It is not advisable to use it.</source>
        <translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3507,37 +3507,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3564,38 +3564,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln έτος(η)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln μήνας(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln ημέρα(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ώρα(ες)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln λεπτό(ά)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln δευτερόλεπτο(α)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Desautentificado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Servicio no disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Error de red</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Error de configuración</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Estado de la cuenta desconocido</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <source>%1 has been moved to %2.</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>No se pudo  </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Una antigua sincronización con journaling &apos;%1&apos; fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Estado no definido.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Preparando la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Sincronización en funcionamiento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>La última sincronización fue exitosa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Error de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Interrumpir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>La sincronización está en pausa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sincronización en pausa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>¡No tenés permisos para escribir el directorio seleccionado!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Ingrese el path al directorio local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleccioná el directorio origen</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>El directorio fue creado con éxito en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Seleccioná acá para sincronizar la cuenta completa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Este folder ya está siendo sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es el directorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar la lista de actividades al portapapeles.</translation>
    </message>
@@ -2393,32 +2393,32 @@ It is not advisable to use it.</source>
        <translation>Compartir vínculo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>EtiquetaDeTexto</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation type="unfinished"/>
    </message>
@@ -2428,29 +2428,29 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>crear</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>El archivo está en la lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Imposible inicializar un diario de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3495,37 +3495,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3552,38 +3552,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Välja logitud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Lahti ühendatud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Ühendatud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Teenus pole saadaval</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Võrgu viga</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Seadistamise tõrge</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Tundmatu konto olek</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Ei suutnud tühistada kataloogi staatust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Leiti vana sünkroniseeringu zurnaal &apos;%1&apos;, kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(varukoopia)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation> (varukoopia %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Määramata staatus.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Oodatakse sünkroonimise alustamist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Valmistun sünkroniseerima.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Sünkroniseerimine on käimas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Viimane sünkroniseerimine oli edukas.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Seadistamise viga.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Kasutaja tühistamine.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Sünkroniseerimine on peatatud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sünkroniseerimine on peatatud)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Sobilikku kausta pole valitud!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Valitud asukoht pole kaust!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sisesta otsingutee kohaliku kataloogini.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Vali algne kaust</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Loo kaugkaust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 - kaust on loodud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Vali see sünkroniseering tervele kontole</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Seda kataloogi juba sünkroniseeritakse.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sa juba sünkroniseerid &lt;i&gt;%1&lt;/i&gt;, mis on &lt;i&gt;%2&lt;/i&gt; ülemkataloog.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering &lt;b&gt;ei ole&lt;/b&gt; toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog.</translation>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1944,17 +1944,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Faili on pärast avastamist muudetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2088,48 +2088,48 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Küsitluse URL puudub</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2172,17 +2172,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Suurus</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
    </message>
@@ -2394,32 +2394,32 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Jaga linki</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>Tekstisilt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Määra &amp;parool</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Määra &amp;aegumise kuupäev</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Määra parool</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Kopeeri &amp;link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Luba muutmine</translation>
    </message>
@@ -2429,29 +2429,29 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>P&amp;arooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Parooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Avalik j&amp;agamine nõuab parooli</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Palun määra parool</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaga linki</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>loo</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>muuda</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Vajalik on uuesti autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Sinu sessioon on aegunud. Sa pead kliendi kasutamiseks uuesti sisse logima.</translation>
    </message>
@@ -2551,7 +2551,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Jagatud kasutajaga %1</translation>
@@ -2845,23 +2845,23 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2881,7 +2881,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2921,109 +2921,109 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fail on märgitud ignoreeritavate nimistus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Faili nimi on liiga pikk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Failinime kodeering pole kehtiv</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Faili nimesonvähemalt üks keelatud märk</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Vali, mida sünkroniseerida&quot; musta nimekirja tõttu vahele jäetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3497,37 +3497,37 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>tulevikus</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>kohe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Vähem kui minut tagasi</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Mõni aeg tagasi</translation>
    </message>
@@ -3554,38 +3554,38 @@ Selle kasutamine pole soovitatav.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln aasta(t)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln kuu(d)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln päeva(a)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln tund(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minut(it)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln sekund(it)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Saioa bukatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Deskonektatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Konektatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Zerbitzua ez dago eskuragarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Sare errorea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Konfigurazio errorea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Kontuaren egoera ezezaguna</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Ezin izan da karpetaren egoera berrezarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Aurkitu da &apos;%1&apos; sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Definitu gabeko egoera.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Itxoiten sinkronizazioa hasteko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Sinkronizazioa prestatzen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Sinkronizazioa martxan da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Konfigurazio errorea.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Erabiltzaileak bertan behera utzi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Sinkronizazioa pausatuta dago.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Sinkronizazioa pausatuta dago)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Ez da karpeta egokirik hautatu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Hautatutako bidea ez da karpeta bat!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Gehitu Sinkronizazio Konexioa</translation>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sartu bertako karpeta berriaren bidea:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Hautatu jatorrizko karpeta</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Sortu Urruneko Karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Sartu behean sortuko den karpeta berriaren izena &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1-en karpeta ongi sortu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentikazioak huts egin du %1en sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Karpetaren zerrenda lortzeak huts egin du: Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Hautatu hau kontu osoa sinkronizatzeko</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Dagoeneko  &lt;i&gt;%1&lt;/i&gt; sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren guraso karpeta dena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Dagoeneko fitxategi guztiak sinkronizatzen ari zara. &lt;b&gt;Ezin&lt;b&gt; da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia.</translation>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Hautatu zer nahi duzun sinkronizatzea: Sinkronizatu nahi ez dituzun urruneko azpikarpetak desmarkatu ditzazkezu.</translation>
    </message>
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2094,48 +2094,48 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fitxategia Ezabatua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2178,17 +2178,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Tamaina</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Bertako sinkronizazio protokolo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiatu jarduera zerrenda arbelara.</translation>
    </message>
@@ -2400,32 +2400,32 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Elkarbanatu lotura</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>TestuEtiketa</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Ezarri &amp;pasahitza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Ezarri &amp;muga data</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Ezarri pasahitza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Kopiatu &amp;lotura</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Baimendu editatzea</translation>
    </message>
@@ -2435,29 +2435,29 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Mesedez Ezarri Pasahitza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>sortu</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>aldatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Berautentikatzea beharrezkoa</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2557,7 +2557,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2849,23 +2849,23 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2885,7 +2885,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2925,109 +2925,109 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Ezin da sinkronizazio egunerokoa ireki</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3501,37 +3501,37 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Orain dela minutu bat baino gutxiago</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3558,38 +3558,38 @@ Ez da gomendagarria erabltzea.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln urte</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln hilabete</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln egun</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ordu</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minutu</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundu</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>خارج شد</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>متصل</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>سرویس خارج از دسترس</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>خطای شبکه</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation type="unfinished"/>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بارگزاری شد.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 بروز رسانی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 به %2 انتقال داده شده است.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <source>Sync Activity</source>
        <translation>فعالیت همگام سازی</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <source>Remove All Files?</source>
        <translation>حذف تمام فایل ها؟</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Remove all files</source>
        <translation>حذف تمام فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="987"/>
        <source>Keep files</source>
        <translation>نگه داشتن فایل ها</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1005"/>
        <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="1010"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation> (backup)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation> (پشتیبان %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>موقعیت تعریف نشده</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>آماده سازی برای همگام سازی کردن.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>همگام سازی در حال اجراست</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>آخرین همگام سازی موفقیت آمیز بود</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>خطا در پیکر بندی.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>خارج کردن کاربر.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>همگام سازی فعلا متوقف شده است</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (همگام‌سازی موقتا متوقف شده است)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>هیچ پوشه‌ی معتبری انتخاب نشده است!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>پوشه ی اصلی را انتخاب کنید</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>پوشه با موفقیت ایجاد شده است  %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>این پوشه همگام‌سازی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>فایل حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>اندازه</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>کپی کردن</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
@@ -2393,32 +2393,32 @@ It is not advisable to use it.</source>
        <translation>اشتراک گذاشتن لینک</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>برچسب متنی</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>تعیین &amp;رمزعبور</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>تعیین &amp;تاریخ انقضا</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>تعیین رمزعبور</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>کپی &amp; لینک</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>اجازه‌ی ویرایش</translation>
    </message>
@@ -2428,29 +2428,29 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>محافظت شده توسط رمزعبور</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>لطفا رمزعبور را تعیین کنید</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;اشتراک‌گذاری لینک</translation>
    </message>
@@ -2468,7 +2468,7 @@ It is not advisable to use it.</source>
        <translation>اشتراک گذاری با کاربران یا گروه ها ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>ایجاد</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>تغییر</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>اشتراک‌گذاری با %1</translation>
@@ -2842,23 +2842,23 @@ It is not advisable to use it.</source>
        <translation>خطا در هنگام خواندن پوشه</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>متوقف شده توسط کاربر</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation>یک خطای داخلی با شماره خطای  %1  رخ داده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>نام فایل خیلی طولانی است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>وضعیت ناموفق</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>رمزگذاری نام فایل معتبر نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>کاراکتر نامعتبر، لطفا &quot;%1&quot; را تغییر نام دهید</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>با توجه به عدم اجازه‌ی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>حذف مجاز نیست، در حال بازگردادن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>فایل‌های محلی و پوشه‌ی اشتراک حذف شد.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3494,37 +3494,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3551,38 +3551,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln سال(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln ماه(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln روز(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ساعت(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln دقیقه (s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln ثانیه(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Kirjauduttu ulos</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Yhteys katkaistu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Yhdistetty</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Palvelu ei ole käytettävissä</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Verkkovirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Asetusvirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Tuntematon tilin tila</translation>
    </message>
@@ -579,158 +579,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <source>Sync Activity</source>
        <translation>Synkronointiaktiviteetti</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -738,112 +738,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Kansion tilaa ei voitu alustaa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation> (varmuuskopio)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation> (varmuuskopio %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Määrittelemätön tila.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Odotetaan synkronoinnin aloitusta.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Valmistellaan synkronointia.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Synkronointi on meneillään.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Asetusvirhe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Synkronointi on keskeytetty.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synkronointi on keskeytetty)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Kelvollista kansiota ei ole valittu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Valittu polku ei ole kansio!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>Paikallinen kansio %1 on jo käytössä kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Paikallinen kansio %1 sisältää kansion, jota käytetään kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Lisää kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Lisää synkronointiyhteys</translation>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Anna paikallisen kansion polku</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Valitse lähdekansio</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Luo etäkansio</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Kansion listaaminen epäonnistui. Virhe: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Valitse tämä synkronoidaksesi koko tilin</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Tätä kansiota synkronoidaan jo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Synkronoit jo kansiota &lt;i&gt;%1&lt;/i&gt;, ja se on kansion &lt;i&gt;%2&lt;/i&gt; yläkansio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Päätä mitä synkronoidaan: voit valinnaisesti jättää valitsematta etäkansioita, joita et halua synkronoitavan.</translation>
    </message>
@@ -1951,17 +1951,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2095,48 +2095,48 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2179,17 +2179,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Koko</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Paikallinen synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopioi toimilista leikepöydälle.</translation>
    </message>
@@ -2401,32 +2401,32 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Jaa linkki</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>TekstiLeima</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Aseta &amp;salasana</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Aseta &amp;vanhenemispäivä</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Aseta salasana</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Kopioi &amp;linkki</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Salli muokkaus</translation>
    </message>
@@ -2436,29 +2436,29 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>&amp;Suojaa salasanalla</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Salasanasuojattu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>&amp;Julkinen jakaminen vaatii salasanan</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Aseta salasana</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaa linkki</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>luo</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>muuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Tunnistaudu</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Tunnistaudu uudelleen</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Istunto on vanhentunut. Kirjaudu uudelleen jatkaaksesi sovelluksen käyttämistä.</translation>
    </message>
@@ -2558,7 +2558,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"/>
@@ -2852,23 +2852,23 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Kansiota lukiessa tapahtui virhe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
    </message>
@@ -2888,7 +2888,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Tiedoston nimi sisältää virheellisiä merkkejä, joita ei voi synkronoida alustariippumattomasti.</translation>
    </message>
@@ -2928,109 +2928,109 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Sisäinen virhe, numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Tiedosto on ohituslistalla.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Tiedoston nimi on liian pitkä.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Virheellisiä merkkejä, anna uusi nimi kohteelle &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Siirto ei ole sallittu, koska %1 on &quot;vain luku&quot;-tilassa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3504,37 +3504,37 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>tulevaisuudessa</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n päivä sitten</numerusform><numerusform>%n päivää sitten</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n tunti sitten</numerusform><numerusform>%n tuntia sitten</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nyt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Alle minuutti sitten</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuutti sitten</numerusform><numerusform>%n minuuttia sitten</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Jokin aika sitten</translation>
    </message>
@@ -3561,38 +3561,38 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <source>%L1 B</source>
        <translation>%L1 t</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln v</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln kk</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln pv</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln t</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln min</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln s</translation>
+        <source>%n year(s)</source>
+        <translation><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>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Servizo non dispoñíbel</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Produciuse un erro de rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Produciuse un erro de configuración</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Estado da conta descoñecido</translation>
    </message>
@@ -579,158 +579,158 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <source>Backup detected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1008"/>
+        <location filename="../src/gui/folder.cpp" line="1012"/>
        <source>Normal Synchronisation</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation type="unfinished"/>
    </message>
@@ -738,112 +738,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Non foi posíbel restabelecer o estado do cartafol</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(copia de seguranza)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(copia de seguranza %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Estado sen definir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Preparando para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Estase sincronizando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronización fíxose correctamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Erro de configuración.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Interrompido polo usuario.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Sincronización en pausa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (sincronización en pausa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Non seleccionou ningún cartafol correcto!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Vostede non ten permiso para escribir neste cartafol!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Escriba a ruta ao cartafol local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Escolla o cartafol de orixe</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crear un cartafol remoto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Creouse correctamente o cartafol en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Non foi posíbel facer a autenticación accedendo a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolla isto para sincronizar toda a conta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Este cartafol xa está sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, é o cartafol pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Xa se están a sincronizar todos os ficheiros. Isto &lt;b&gt;non&lt;/b&gt; é compatíbel co sincronización doutro cartafol. Se quere sincronizar varios cartafoles, retire a sincronización do cartafol raíz configurado actualmente.</translation>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Escolla que sincronizar: Opcionalmente pode deselecionar subcartafoles remotos que non queira sincronizar.</translation>
    </message>
@@ -1950,17 +1950,17 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro cambiou após seren atopado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2094,48 +2094,48 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>O ficheiro local cambiou durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt &lt;5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Non se atopa o URL requirido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>O ficheiro local retirarase durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2178,17 +2178,17 @@ Recomendámoslle que non o use.</translation>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista da actividade no portapapeis.</translation>
    </message>
@@ -2400,32 +2400,32 @@ Recomendámoslle que non o use.</translation>
        <translation>Ligazón para compartir</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>Etiqueta de texto</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Estabelecer o &amp;contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Definir a &amp;data de caducidade</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Estabelecer o contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Copiar a &amp;ligazón</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Permitir a edición</translation>
    </message>
@@ -2435,29 +2435,29 @@ Recomendámoslle que non o use.</translation>
        <translation>Contr&amp;asinal de protección</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Protexido con contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>A comp&amp;artición pública precisa de contrasinal </translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Estabeleza o contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Ligazón para compartir</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>crear</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>cambio</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticado</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>É necesario volver autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Caducou a sesión. É necesario que volva a acceder para seguir usando o cliente. </translation>
    </message>
@@ -2557,7 +2557,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartir con %1</translation>
@@ -2851,23 +2851,23 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2887,7 +2887,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Interrompido polo usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>O nome de ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
    </message>
@@ -2927,109 +2927,109 @@ Recomendámoslle que non o use.</translation>
        <translation>Produciuse un erro interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>O ficheiro está na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>O nome de ficheiro é longo de máis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Fallou a obtención de estatísticas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>O nome de ficheiro codificado non é correcto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres incorrectos, déalle outro nome a «%1»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Non é posíbel preparar un rexistro de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Non foi posíbel abrir o rexistro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome de ficheiro contén algún carácter incorrecto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -3503,37 +3503,37 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3560,38 +3560,38 @@ Recomendámoslle que non o use.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ano(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mes(es)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln día(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Kijelentkezve</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Szétcsatlakozva</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Csatlakozva</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Szolgáltatás nem érhető el</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Hálózati hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Beállítási hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Ismeretlen fiók állapot</translation>
    </message>
@@ -579,157 +579,157 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Helyi file-ok megtartása konfliktusként</translation>
    </message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(biztonsági mentés)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(biztonsági mentés: %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Ismeretlen állapot.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Várakozás a szinkronizálás elindítására.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Előkészítés szinkronizációhoz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Szinkronizálás fut.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Legutolsó szinkronizálás sikeres volt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Az utolsó szinkronizáció sikeresen lefutott, de néhány figyelmeztetés van.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Beállítás hiba.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Felhasználó megszakította.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Szinkronizálás megállítva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (szinkronizálás megállítva)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Nincs érvényes könyvtár kiválasztva!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>A kiválasztott elérési út nem könyvtár!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Nincs joga a kiválasztott könyvtár írásához!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation 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="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Adjon meg a helyi könyvtár elérési útját.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Forrás könyvtár kiválasztása</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>A mappa sikeresen létrehozva: %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Ez a mappa már szinkronizálva van.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1947,17 +1947,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2091,48 +2091,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fájl törölve</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2175,17 +2175,17 @@ It is not advisable to use it.</source>
        <translation>Méret</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Másolás</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Az aktivitási lista másolása a vágólapra.</translation>
    </message>
@@ -2397,32 +2397,32 @@ It is not advisable to use it.</source>
        <translation>Megosztás hivatkozással</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>TextLabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>&amp;Jelszó beállítása</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>&amp;Lejárati dátum beállítása</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Jelszó beállítása</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>&amp;Hivatkozás másolása</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Szerkesztés engedélyezése</translation>
    </message>
@@ -2432,29 +2432,29 @@ It is not advisable to use it.</source>
        <translation>J&amp;elszóval védve</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Jelszóval védett</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>A fájlt nem lehetett megosztani, mert megosztási jogosultság nélkül lett megosztva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Nyilvános me&amp;gosztáshoz szükség van jelszóra</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Kérjük, állíts be egy jelszót</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>Hivatkozás &amp;megosztása</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>létrehoz</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>változtatás</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Azonosítás</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Felhasználóazonosítás szükséges</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2554,7 +2554,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Megosztás vele: %1</translation>
@@ -2847,23 +2847,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2883,7 +2883,7 @@ It is not advisable to use it.</source>
        <translation>Felhasználó megszakította</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2923,109 +2923,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fájl a kizárási listán.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Fájlnév túl nagy.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Érvénytelen karakterek, kérjük nevezd át: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>a cél</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a forrás</translation>
    </message>
@@ -3499,37 +3499,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation type="unfinished"/>
    </message>
@@ -3556,38 +3556,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%ln év</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%ln hónap</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln nap</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln óra</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln perc</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln másodperc</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Disconnesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Disconnesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Connesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Servizio non disponibile</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Errore di rete</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Errore di configurazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Stato dell&apos;account sconosciuto</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Mantieni i file locali come conflitto</translation>
    </message>
@@ -742,112 +742,112 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Impossibile ripristinare lo stato della cartella</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>È stato trovato un vecchio registro di sincronizzazione &apos;%1&apos;, ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(copia di sicurezza)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(copia di sicurezza %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Stato non definito.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>In attesa di iniziare la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Preparazione della sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>La sincronizzazione è in corso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>L&apos;ultima sincronizzazione è stata completata correttamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Errore di configurazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Interrotto dall&apos;utente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>La sincronizzazione è sospesa.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation> %1 (La sincronizzazione è sospesa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Nessuna cartella valida selezionata!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Il percorso selezionato non è una cartella!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è già utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
    </message>
@@ -1001,12 +1001,12 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Aggiungi connessione di sincronizzazione</translation>
    </message>
@@ -1024,7 +1024,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
        <translation>Digita il percorso della cartella locale.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Seleziona la cartella di origine</translation>
    </message>
@@ -1032,52 +1032,52 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Crea cartella remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Digita il nome della nuova cartella da creare sotto a &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La cartella è stata creata correttamente su %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autenticazione non riuscita durante l&apos;accesso a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Impossibile elencare una cartella. Errore: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Selezionala per sincronizzare l&apos;intero account</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Questa cartella è già sincronizzata.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è la cartella superiore di &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Stai già sincronizzando tutti i tuoi file. La sincronizzazione di un&apos;altra cartella &lt;b&gt;non&lt;/b&gt; è supportata. Se vuoi sincronizzare più cartelle, rimuovi la configurazione della cartella principale di sincronizzazione.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Scegli cosa sincronizzare: puoi deselezionare opzionalmente le sottocartelle remote che non desideri sincronizzare.</translation>
    </message>
@@ -1955,17 +1955,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Il file è stato modificato dal suo rilevamento</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2099,48 +2099,48 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzare l&apos;interruzione dell&apos;operazione in caso di ripristino della connessione HTTP con Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>URL di richiesta mancante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Il server non ha riconosciuto l&apos;ultimo pezzo. (Non era presente alcun e-tag)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2183,17 +2183,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Dimensione</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocollo di sincronizzazione locale</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia l&apos;elenco delle attività negli appunti.</translation>
    </message>
@@ -2405,32 +2405,32 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Condividi collegamento</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>EtichettaTesto</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Imposta &amp;password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Imposta data di scad&amp;enza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>imposta la password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Copia co&amp;llegamento</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Consenti la modifica</translation>
    </message>
@@ -2440,29 +2440,29 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Proteggi con p&amp;assword</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Protetta da password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>La condivisione pubblic&amp;a richiede una password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>imposta la password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>Condividi colle&amp;gamento</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>crea</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>cambia</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Nuova autenticazione richiesta</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>La tua sessione è scaduta. Devi effettuare nuovamente l&apos;accesso per continuare a utilizzare il client.</translation>
    </message>
@@ -2562,7 +2562,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Condividi con %1</translation>
@@ -2856,23 +2856,23 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Errore durante la lettura della cartella.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Il file/cartella è ignorato poiché è nascosto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
    </message>
@@ -2892,7 +2892,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Interrotto dall&apos;utente</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Il nome del file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
    </message>
@@ -2932,109 +2932,109 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>SI è verificato un errore interno numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;elemento non è sincronizzato a causa dell&apos;errore precedente: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Il file è stato aggiunto alla lista ignorati.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Il nome del file è troppo lungo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat non riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>La codifica del nome del file non è valida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caratteri non validi, rinomina &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Impossibile leggere la lista nera dal database locale</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Impossibile leggere dal registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Il nome del file contiene almeno un carattere non valido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -3508,37 +3508,37 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>nel futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>adesso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Meno di un minuto fa</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Tempo fa</translation>
    </message>
@@ -3565,38 +3565,38 @@ Non è consigliabile utilizzarlo.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln anno(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mese(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln giorno(i)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln ora(e)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(i)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln secondo(i)</translation>
+        <source>%n year(s)</source>
+        <translation><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>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Logget ut</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Frakoblet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Tilkoblet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Tjeneste utilgjengelig</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Nettverksfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Konfigurasjonsfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Ukjent kontotilstand</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <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="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <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="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <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="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <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="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <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="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <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="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <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="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <source>Sync Activity</source>
        <translation>Synkroniseringsaktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behold lokale filer som konflikt</translation>
    </message>
@@ -742,112 +742,112 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Klarte ikke å tilbakestille mappetilstand</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>En gammel synkroniseringsjournal &apos;%1&apos; ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation> (sikkerhetskopi)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation> (sikkerhetskopi %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Udefinert tilstand.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>Venter på å starte synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Forbereder synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Synkronisering kjører.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Siste synkronisering var vellykket.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Siste synkronisering var vellykket, men med advarsler på enkelte filer.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Feil med oppsett.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Brukeravbrudd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Synkronisering er satt på pause.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synkronisering er satt på pause)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Ingen gyldig mappe valgt!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Den valgte stien er ikke en mappe!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Du har ikke skrivetilgang til den valgte mappen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er allerede brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
    </message>
@@ -1001,12 +1001,12 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Legg til mappe-synkronisering</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Legg til tilkobling for synkronisering</translation>
    </message>
@@ -1024,7 +1024,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
        <translation>Legg inn stien til den lokale mappen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Velg kildemappe</translation>
    </message>
@@ -1032,52 +1032,52 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Opprett ekstern mappe</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Oppgi navnet på den nye mappen som skal opprettes under &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Mappen ble opprettet på %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentisering feilet ved tilgang til %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Klarte ikke å liste en mappe. Feil: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Velg dette for å synkronisere en hel konto</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Denne mappen synkroniseres allerede.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Du synkroniserer allerede &lt;i&gt;%1&lt;/i&gt;, som er foreldremappe for &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Du synkroniserer allerede alle filene dine. Synkronisering av enda en mappe støttes &lt;b&gt;ikke&lt;/b&gt;. Hvis du vil synkronisere flere mapper må du fjerne den konfigurerte synkroniseringen av rotmappe.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Velg hva som skal synkroniseres: Du kan velge bort mapper som du ikke vil synkronisere.</translation>
    </message>
@@ -1956,17 +1956,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Filen er endret siden den ble oppdaget</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2100,48 +2100,48 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Fil fjernet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil endret under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Filen ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Forespørsels-URL mangler</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Den lokale filen ble fjernet under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2184,17 +2184,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Størrelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokal synkroniseringsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopier</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopier aktivitetslisten til utklippstavlen.</translation>
    </message>
@@ -2406,32 +2406,32 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Del lenke</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>Tekst-etikett</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Sett &amp;passord </translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Sett &amp;utløpsdato</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Sett passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Kopier &amp;lenke</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Tillat redigering</translation>
    </message>
@@ -2441,29 +2441,29 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>P&amp;assordbeskyttelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Passordbeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Offentlig d&amp;eling krever et passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Sett passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Del lenke</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>opprette</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>endre</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autentiser</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Ny autentisering kreves</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Økten din har utløpt. Du må logge inn på nytt for å fortsette å bruke klienten.</translation>
    </message>
@@ -2563,7 +2563,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Del med %1</translation>
@@ -2857,23 +2857,23 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Feil ved lesing av mappe.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Filen/mappen ignoreres fordi den er skjult.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
    </message>
@@ -2893,7 +2893,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Avbrutt av brukeren</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Filnavnet inneholder ugyldige tegn som ikke kan synkroniseres på tvers av plattformer.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>En intern feil nummer %1 oppstod.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Elementet er ikke synkronisert på grunn av tidligere feil: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolske lenker støttes ikke i synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Filen ligger på ignoreringslisten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>Filnavn er for langt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat feilet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Filnavn-koding er ikke gyldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ugyldige tegn, gi et annet navn til &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan ikke åpne synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorert på grunn av svartelisten &quot;velg hva som skal synkroniseres&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ikke tillatt å fjerne, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale filer og delingsmappe fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Flytting ikke tillatt, element gjenopprettet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>målet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>kilden</translation>
    </message>
@@ -3509,37 +3509,37 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>fram i tid</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nå</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>For mindre enn et minutt siden</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>For en stund siden</translation>
    </message>
@@ -3566,38 +3566,38 @@ Det er ikke tilrådelig å bruke den.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln år</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln måned(er)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dag(er)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln time(r)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minutt(er)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln sekund(er)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Afgemeld</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Niet verbonden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Verbonden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Dienst niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Netwerkfout</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Configuratiefout</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Onbekende account-status</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <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="137"/>
+        <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="140"/>
+        <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="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <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="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <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="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <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="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <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="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <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="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <source>%1 and %n other file(s) have been removed.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <source>%1 and %n other file(s) have been updated.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
-        <translation type="unfinished"/>
+        <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <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="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <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="751"/>
        <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="962"/>
        <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="980"/>
        <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="984"/>
        <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="986"/>
        <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="987"/>
        <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="1005"/>
        <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="1010"/>
        <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="1012"/>
        <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="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Behoud lokale bestanden als conflict</translation>
    </message>
@@ -742,112 +742,112 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Kan de beginstaat van de map niet terugzetten</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Een oud synchronisatieverslag  &apos;%1&apos; is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation>(backup)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation>(backup %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Ongedefiniëerde staat</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>In afwachting van synchronisatie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Synchronisatie wordt voorbereid</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>Bezig met synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>Laatste synchronisatie was geslaagd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Installatiefout.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Afgebroken door gebruiker.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Synchronisatie gepauzeerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Synchronisatie onderbroken)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Geen geldige map geselecteerd!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>Het geselecteerde pad is geen map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 wordt al in de mapsync gebruikt. Kies een andere map!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 is een symbolische link. De doellink bevat al een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
    </message>
@@ -1002,12 +1002,12 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Toevoegen Sync verbinding</translation>
    </message>
@@ -1025,7 +1025,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
        <translation>Geef het pad op naar de lokale map.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Selecteer de bronmap</translation>
    </message>
@@ -1033,52 +1033,52 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Externe map aanmaken</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Voer de naam van de hieronder te maken nieuwe map in &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Map is succesvol aangemaakt op %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Authenticatie mislukt bij benaderen %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Tonen mappenlijst mislukt. Fout: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Kies dit om uw volledige account te synchroniseren</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Deze map is al gesynchroniseerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>U synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>U bent al uw bestanden al aan het synchroniseren. Het synchroniseren van een andere map wordt &lt;b&gt;niet&lt;/b&gt; ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen.</translation>
    </message>
@@ -1086,7 +1086,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Kies wat u wilt synchroniseren: u kunt optioneel submappen die u niet wilt synchroniseren deselecteren.</translation>
    </message>
@@ -1954,20 +1954,20 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation type="unfinished"/>
+        <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2101,48 +2101,48 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>URL opvraag ontbreekt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2185,17 +2185,17 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Grootte</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Lokaal sync protocol</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Kopiëren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopieer de activiteitenlijst naar het klembord.</translation>
    </message>
@@ -2386,7 +2386,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="113"/>
        <source>Retrieving maximum possible sharing permissions from server...</source>
-        <translation type="unfinished"/>
+        <translation>Maximum aantal mogelijke permissies van de server ophalen...</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2407,32 +2407,32 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Deel link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>Tekstlabel</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Instellen &amp;wachtwoord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Stel &amp;vervaldatum in</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Instellen wachtwoord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Kopiëren &amp;link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Toestaan bewerken</translation>
    </message>
@@ -2442,29 +2442,29 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>&amp;Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Openbaar de&amp;len vereist een wachtwoord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Stel uw wachtwoord in</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>&amp;Deel link</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="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <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="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>creëer</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>wijzig</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <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="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - authenticeren</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Hernieuwde authenticatie nodig</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Uw sessie is verstreken. U moet opnieuw inloggen om de client-applicatie te gebruiken.</translation>
    </message>
@@ -2564,7 +2564,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Delen met %1</translation>
@@ -2858,23 +2858,23 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Fout tijdens lezen map.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
    </message>
@@ -2894,7 +2894,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Afgebroken door de gebruiker</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Bestandsnaam bevat ongeldige tekens die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
    </message>
@@ -2934,109 +2934,109 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Een interne fout met nummer %1 is opgetreden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>Het bestand is opgenomen op de negeerlijst.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>De bestandsnaam is te lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>Bestandsnaamcodering is niet geldig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ongeldige tekens, hernoem &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Niet in staat om een synchronisatie transactielog te starten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Kan de blacklist niet lezen uit de lokale database</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; zwarte lijst</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan om te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale bestanden en share-map verwijderd. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -3510,37 +3510,37 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>in de toekomst</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>nu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>Minder dan een minuut geleden</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Even geleden</translation>
    </message>
@@ -3567,38 +3567,38 @@ We adviseren deze site niet te gebruiken.</translation>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ja(a)r(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln maand(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dag(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln u(u)r(en)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minu(u)t(en)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln seconde(n)</translation>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="322"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="323"/>
+        <source>%n minute(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="324"/>
+        <source>%n second(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
@@ -3639,7 +3639,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
        <source>Server version downloaded, copied changed local file into conflict file</source>
-        <translation type="unfinished"/>
+        <translation>Serverversie gedownload, gewijzigde lokale bestand gekopieerd in conflictbestand</translation>
    </message>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
@@ -290,37 +290,37 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Signed out</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="114"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="113"/>
+        <location filename="../src/gui/accountstate.cpp" line="116"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="115"/>
+        <location filename="../src/gui/accountstate.cpp" line="118"/>
        <source>Service unavailable</source>
        <translation>Serviço indisponível</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="117"/>
+        <location filename="../src/gui/accountstate.cpp" line="120"/>
        <source>Network error</source>
        <translation>Erro de rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="119"/>
+        <location filename="../src/gui/accountstate.cpp" line="122"/>
        <source>Configuration error</source>
        <translation>Erro de configuração</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="121"/>
+        <location filename="../src/gui/accountstate.cpp" line="124"/>
        <source>Unknown account state</source>
        <translation>Estado da conta desconhecido</translation>
    </message>
@@ -579,119 +579,119 @@
 <context>
    <name>OCC::Folder</name>
    <message>
-        <location filename="../src/gui/folder.cpp" line="134"/>
+        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
        <translation>A pasta local %1 não existe.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="137"/>
+        <location filename="../src/gui/folder.cpp" line="138"/>
        <source>%1 should be a folder but is not.</source>
        <translation>%1 deve ser uma pasta, mas não é.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="140"/>
+        <location filename="../src/gui/folder.cpp" line="141"/>
        <source>%1 is not readable.</source>
        <translation>%1 não pode ser lido.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="384"/>
+        <location filename="../src/gui/folder.cpp" line="387"/>
        <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="494"/>
+        <location filename="../src/gui/folder.cpp" line="497"/>
        <source>%1 has been removed.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi removido.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="501"/>
+        <location filename="../src/gui/folder.cpp" line="504"/>
        <source>%1 has been downloaded.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi baixado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="508"/>
+        <location filename="../src/gui/folder.cpp" line="511"/>
        <source>%1 has been updated.</source>
        <comment>%1 names a file.</comment>
        <translation>%1 foi atualizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="515"/>
+        <location filename="../src/gui/folder.cpp" line="518"/>
        <source>%1 has been renamed to %2.</source>
        <comment>%1 and %2 name files.</comment>
        <translation>%1 foi renomeado para %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="522"/>
+        <location filename="../src/gui/folder.cpp" line="525"/>
        <source>%1 has been moved to %2.</source>
        <translation>%1 foi movido para %2.</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="492"/>
+        <location filename="../src/gui/folder.cpp" line="495"/>
        <source>%1 and %n other file(s) have been removed.</source>
        <translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="499"/>
+        <location filename="../src/gui/folder.cpp" line="502"/>
        <source>%1 and %n other file(s) have been downloaded.</source>
        <translation><numerusform>%1 e %n outro arquivo foi baixado.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="506"/>
+        <location filename="../src/gui/folder.cpp" line="509"/>
        <source>%1 and %n other file(s) have been updated.</source>
        <translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="513"/>
+        <location filename="../src/gui/folder.cpp" line="516"/>
        <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
        <translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="520"/>
+        <location filename="../src/gui/folder.cpp" line="523"/>
        <source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
        <translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="527"/>
+        <location filename="../src/gui/folder.cpp" line="530"/>
        <source>%1 has and %n other file(s) have sync conflicts.</source>
        <translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="529"/>
+        <location filename="../src/gui/folder.cpp" line="532"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
        <translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folder.cpp" line="534"/>
+        <location filename="../src/gui/folder.cpp" line="537"/>
        <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 outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não poderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="536"/>
+        <location filename="../src/gui/folder.cpp" line="539"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
        <translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="542"/>
+        <location filename="../src/gui/folder.cpp" line="545"/>
        <source>Sync Activity</source>
        <translation>Atividade de Sincronização</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="747"/>
+        <location filename="../src/gui/folder.cpp" line="751"/>
        <source>Could not read system exclude file</source>
        <translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="958"/>
+        <location filename="../src/gui/folder.cpp" line="962"/>
        <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>Uma nova pasta maior que %1 MB foi adicionada: %2.
 Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="976"/>
+        <location filename="../src/gui/folder.cpp" line="980"/>
        <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 @@ Isso pode ser porque a pasta foi reconfigurada em silêncio, ou porque todos os
 Tem certeza de que deseja executar esta operação?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="980"/>
+        <location filename="../src/gui/folder.cpp" line="984"/>
        <source>Remove All Files?</source>
        <translation>Deseja Remover Todos os Arquivos?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="982"/>
+        <location filename="../src/gui/folder.cpp" line="986"/>
        <source>Remove all files</source>
        <translation>Remover todos os arquivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="983"/>
+        <location filename="../src/gui/folder.cpp" line="987"/>
        <source>Keep files</source>
        <translation>Manter arquivos</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1001"/>
+        <location filename="../src/gui/folder.cpp" line="1005"/>
        <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 @@ Isso pode ser porque um backup foi restaurado no servidor.
 Continuando a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo mais velho em um estado anterior. Você deseja manter seus locais de arquivos mais recentes como arquivos de conflito?</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1006"/>
+        <location filename="../src/gui/folder.cpp" line="1010"/>
        <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="1012"/>
        <source>Normal Synchronisation</source>
        <translation>Sincronização Normal</translation>
    </message>
    <message>
-        <location filename="../src/gui/folder.cpp" line="1009"/>
+        <location filename="../src/gui/folder.cpp" line="1013"/>
        <source>Keep Local Files as Conflict</source>
        <translation>Manter Arquivos Locais como Conflito</translation>
    </message>
@@ -742,112 +742,112 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderMan</name>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="264"/>
+        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
        <translation>Não foi possível redefinir o estado da pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="265"/>
+        <location filename="../src/gui/folderman.cpp" line="266"/>
        <source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
        <translation>Uma velha revista de sincronização &apos;%1&apos; foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="913"/>
+        <location filename="../src/gui/folderman.cpp" line="926"/>
        <source> (backup)</source>
        <translation> (backup)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="918"/>
+        <location filename="../src/gui/folderman.cpp" line="931"/>
        <source> (backup %1)</source>
        <translation> (backup %1)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1125"/>
+        <location filename="../src/gui/folderman.cpp" line="1138"/>
        <source>Undefined State.</source>
        <translation>Estado indefinido.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1128"/>
+        <location filename="../src/gui/folderman.cpp" line="1141"/>
        <source>Waiting to start syncing.</source>
        <translation>À espera do início da sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1131"/>
+        <location filename="../src/gui/folderman.cpp" line="1144"/>
        <source>Preparing for sync.</source>
        <translation>Preparando para sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1134"/>
+        <location filename="../src/gui/folderman.cpp" line="1147"/>
        <source>Sync is running.</source>
        <translation>A sincronização está ocorrendo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1137"/>
+        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>Last Sync was successful.</source>
        <translation>A última sincronização foi feita com sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1142"/>
+        <location filename="../src/gui/folderman.cpp" line="1155"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
        <translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1145"/>
+        <location filename="../src/gui/folderman.cpp" line="1158"/>
        <source>Setup Error.</source>
        <translation>Erro de Configuração.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1148"/>
+        <location filename="../src/gui/folderman.cpp" line="1161"/>
        <source>User Abort.</source>
        <translation>Usuário Abortou.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1151"/>
+        <location filename="../src/gui/folderman.cpp" line="1164"/>
        <source>Sync is paused.</source>
        <translation>Sincronização pausada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1157"/>
+        <location filename="../src/gui/folderman.cpp" line="1170"/>
        <source>%1 (Sync is paused)</source>
        <translation>%1 (Pausa na Sincronização) </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1165"/>
+        <location filename="../src/gui/folderman.cpp" line="1178"/>
        <source>No valid folder selected!</source>
        <translation>Nenhuma pasta válida selecionada!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1176"/>
+        <location filename="../src/gui/folderman.cpp" line="1189"/>
        <source>The selected path is not a folder!</source>
        <translation>O caminho selecionado não é uma pasta!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1180"/>
+        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
        <translation>Voce não tem permissão para escrita na pasta selecionada!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1195"/>
+        <location filename="../src/gui/folderman.cpp" line="1208"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
        <translation>A pasta local %1 já está sendo utilizada em uma conexão de sincronização de pastas. Por favor, escolha uma outra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1200"/>
+        <location filename="../src/gui/folderman.cpp" line="1213"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1207"/>
+        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
        <translation>A pasta local %1 é um link simbólico. O destino do link já contém uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1214"/>
+        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderman.cpp" line="1220"/>
+        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
        <translation>A pasta local %1 é um link simbólico. O destino do link já está contido em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
    </message>
@@ -1001,12 +1001,12 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="553"/>
+        <location filename="../src/gui/folderwizard.cpp" line="542"/>
        <source>Add Folder Sync Connection</source>
        <translation>Adicionar Conexão de Sincronização de pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="555"/>
+        <location filename="../src/gui/folderwizard.cpp" line="544"/>
        <source>Add Sync Connection</source>
        <translation>Adicionar Conexão de Sincronização</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
        <translation>Entre com o caminha para a pasta local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="133"/>
+        <location filename="../src/gui/folderwizard.cpp" line="126"/>
        <source>Select the source folder</source>
        <translation>Selecione a pasta de origem</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="191"/>
+        <location filename="../src/gui/folderwizard.cpp" line="176"/>
        <source>Create Remote Folder</source>
        <translation>Criar uma Pasta Remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="192"/>
+        <location filename="../src/gui/folderwizard.cpp" line="177"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Entre com o nome da nova pasta a ser criada abaixo &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="221"/>
+        <location filename="../src/gui/folderwizard.cpp" line="206"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Pasta foi criada com sucesso em %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="232"/>
+        <location filename="../src/gui/folderwizard.cpp" line="217"/>
        <source>Authentication failed accessing %1</source>
        <translation>Falha na autenticação acessando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="234"/>
+        <location filename="../src/gui/folderwizard.cpp" line="219"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="241"/>
+        <location filename="../src/gui/folderwizard.cpp" line="226"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Falha ao listar uma pasta. Erro: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="322"/>
+        <location filename="../src/gui/folderwizard.cpp" line="307"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolha esta opção para sincronizar a conta inteira</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="451"/>
+        <location filename="../src/gui/folderwizard.cpp" line="436"/>
        <source>This folder is already being synced.</source>
        <translation>Esta pasta já está sendo sincronizada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="453"/>
+        <location filename="../src/gui/folderwizard.cpp" line="438"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma pasta mãe de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="457"/>
+        <location filename="../src/gui/folderwizard.cpp" line="442"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Você já está sincronizando todos os seus arquivos. Sincronizar outra pasta &lt;b&gt;não&lt;/ b&gt; é possível. Se você deseja sincronizar várias pastas, por favor, remova a sincronização configurada atualmente para a pasta raiz.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="495"/>
+        <location filename="../src/gui/folderwizard.cpp" line="480"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Escolha o que Sincronizar: Você pode, opcionalmente, desmarcar subpastas remotas que você não deseja sincronizar.</translation>
    </message>
@@ -1956,17 +1956,17 @@ It is not advisable to use it.</source>
        <translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
        <source>File has changed since discovery</source>
        <translation>Arquivo foi alterado desde a descoberta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -2100,48 +2100,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
        <source>File Removed</source>
        <translation>Arquivo Removido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
        <source>Local file changed during sync.</source>
        <translation>Arquivo local modificado durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
        <source>Poll URL missing</source>
        <translation>Faltando conjunto de URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
        <source>The local file was removed during sync.</source>
        <translation>O arquivo local foi removido durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -2184,17 +2184,17 @@ It is not advisable to use it.</source>
        <translation>Tamanho</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
        <translation>Protocolo de sincronização local</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar a lista de atividades para a área de transferência.</translation>
    </message>
@@ -2406,32 +2406,32 @@ It is not advisable to use it.</source>
        <translation>Compartilhar link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="40"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>TextLabel</source>
        <translation>RótuloTexto</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="114"/>
        <source>Set &amp;password </source>
        <translation>Configurar &amp;senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="128"/>
        <source>Set &amp;expiration date</source>
        <translation>Configurar data de &amp;expiração</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="152"/>
        <source>Set password</source>
        <translation>Configurar senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="201"/>
        <source>Copy &amp;link</source>
        <translation>Copiar &amp;link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
+        <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
        <source>Allow editing</source>
        <translation>Permitir edição</translation>
    </message>
@@ -2441,29 +2441,29 @@ It is not advisable to use it.</source>
        <translation>S&amp;enha de proteção</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="207"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
        <source>Password Protected</source>
        <translation>Protegido por Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="377"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="423"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Comp&amp;artilhamento público requer uma senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="445"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="509"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="510"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
        <source>&amp;Share link</source>
        <translation>Link de &amp;Compartilhamento</translation>
    </message>
@@ -2481,7 +2481,7 @@ It is not advisable to use it.</source>
        <translation>Compartilhar com usuários ou grupos ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="226"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <source>No results for &apos;%1&apos;</source>
        <translation>Sem resultados para &apos;%1&apos;</translation>
    </message>
@@ -2514,17 +2514,17 @@ It is not advisable to use it.</source>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="302"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="300"/>
        <source>create</source>
        <translation>criar</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="305"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="303"/>
        <source>change</source>
        <translation>mudança</translation>
    </message>
    <message>
-        <location filename="../src/gui/shareusergroupwidget.cpp" line="308"/>
+        <location filename="../src/gui/shareusergroupwidget.cpp" line="306"/>
        <source>delete</source>
        <translation>excluir</translation>
    </message>
@@ -2545,17 +2545,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticar</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Reauthentication required</source>
        <translation>Reautenticação necessária</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Sua sessão expirou. É preciso re-login para continuar a usar o cliente.</translation>
    </message>
@@ -2563,7 +2563,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="435"/>
+        <location filename="../src/gui/socketapi.cpp" line="453"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartilhar com %1</translation>
@@ -2857,23 +2857,23 @@ It is not advisable to use it.</source>
        <translation>Erro ao ler pasta.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="690"/>
+        <location filename="../src/libsync/syncengine.cpp" line="701"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
    </message>
@@ -2893,7 +2893,7 @@ It is not advisable to use it.</source>
        <translation>Abortado pelo usuário</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="425"/>
+        <location filename="../src/libsync/syncengine.cpp" line="434"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Nome do arquivo contém caracteres inválidos que não podem ser sincronizados entre plataformas.</translation>
    </message>
@@ -2933,109 +2933,109 @@ It is not advisable to use it.</source>
        <translation>Um erro interno de número %1 ocorreu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="254"/>
+        <location filename="../src/libsync/syncengine.cpp" line="263"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>O item não está sincronizado devido a erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="419"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Linques simbólicos não são suportados em sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="422"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File is listed on the ignore list.</source>
        <translation>O arquivo está listado na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Filename is too long.</source>
        <translation>O nome do arquivo é muito longo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="446"/>
        <source>Stat failed.</source>
        <translation>Stat falhou.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="464"/>
+        <location filename="../src/libsync/syncengine.cpp" line="473"/>
        <source>Filename encoding is not valid</source>
        <translation>A codificação do nome do arquivo não é válida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="635"/>
+        <location filename="../src/libsync/syncengine.cpp" line="644"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres inválidos, por favor renomear &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="724"/>
+        <location filename="../src/libsync/syncengine.cpp" line="735"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibilitado de iniciar a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="743"/>
+        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="776"/>
+        <location filename="../src/libsync/syncengine.cpp" line="787"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Não é possível ler a partir do relatório de sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="822"/>
+        <location filename="../src/libsync/syncengine.cpp" line="833"/>
        <source>Cannot open the sync journal</source>
        <translation>Não é possível abrir o arquivo de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="876"/>
+        <location filename="../src/libsync/syncengine.cpp" line="887"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome do arquivo contem pelo menos um caractere inválido  </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não é permitido remover, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
        <source>Local files and share folder removed.</source>
        <translation>Arquivos locais e pasta compartilhada removida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
        <source>Move not allowed, item restored</source>
        <translation>Não é permitido mover, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Não é permitido mover porque %1 é somente para leitura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
        <source>the source</source>
        <translation>a fonte</translation>
    </message>
@@ -3509,37 +3509,37 @@ It is not advisable to use it.</source>
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="468"/>
+        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
        <translation>no futuro</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="464"/>
+        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
        <translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="472"/>
+        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
        <translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="477"/>
+        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
        <translation>agora</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="479"/>
+        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
        <translation>A menos de um minuto atrás</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/libsync/utility.cpp" line="482"/>
+        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
        <translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="485"/>
+        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
        <translation>Algum tempo atrás</translation>
    </message>
@@ -3566,38 +3566,38 @@ It is not advisable to use it.</source>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%Ln year(s)</source>
-        <translation>%Ln ano(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%Ln month(s)</source>
-        <translation>%Ln mês(es)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%Ln day(s)</source>
-        <translation>%Ln dia(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%Ln hour(s)</source>
-        <translation>%Ln hora(s)</translation>
-    </message>
-    <message>
-        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%Ln minute(s)</source>
-        <translation>%Ln minuto(s)</translation>
-    </message>
-    <message>
+    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%Ln second(s)</source>
-        <translation>%Ln segundo(s)</translation>
+        <source>%n year(s)</source>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="320"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>%n mês</numerusform><numerusform>%n mês(es)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libsync/utility.cpp" line="321"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>%n day</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>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="343"/>
+        <location filename="../src/libsync/utility.cpp" line="348"/>
        <source>%1 %2</source>
        <translation>%1 %2</translation>
    </message>
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Daniel Molkentin	1a6283e59f	v2.2.1	2016-06-06 10:50:02 +02:00
Daniel Molkentin	066ee2fca7	Update ChangeLog	2016-06-06 10:49:29 +02:00
Daniel Molkentin	1787da8a9d	Fix memleak in updater	2016-06-02 15:03:52 +02:00
Jenkins for ownCloud	9ab812f89b	[tx-robot] updated from transifex	2016-06-01 02:19:17 -04:00
Markus Goetz	de82d8fcdb	QNAM: Try to workaround missing Qt patches #4720 #3888 #4051 We try this on all platforms now so we have more consistent behaviour.	2016-05-31 10:26:52 +02:00
Stephen Colebrook	af2b712dc6	Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps.	2016-05-31 09:46:52 +02:00
Markus Goetz	a507558dee	Connectivity: Reduce ETag job timeout to 60 sec #4275 Before it used the default job timeout	2016-05-31 09:35:47 +02:00
Jenkins for ownCloud	e73c3199c0	[tx-robot] updated from transifex	2016-05-31 02:20:28 -04:00
Markus Goetz	d88ab4653b	Connectivity: Delete job on timeout #4275 This was not done if there was no reply	2016-05-30 18:15:41 +02:00
Klaas Freitag	9a2450c4c1	Update changelog for 2.2.1	2016-05-30 17:19:40 +02:00
Daniel Molkentin	3c1f5e662f	Remove stray file	2016-05-30 12:05:22 +02:00
Daniel Molkentin	100ee69ddd	Merge pull request #4923 from RobinGeuze/2.2 Fix Qt4 build	2016-05-30 11:50:50 +02:00
Robin Geuze	d45d6ca9da	Fix Qt4 build	2016-05-30 09:55:45 +02:00
Daniel Molkentin	2608c7007e	Merge pull request #4922 from owncloud/fix_4840 Don't try to determine pixel ratio with Qt < 5.6.0	2016-05-30 09:20:50 +02:00
Jenkins for ownCloud	06a88ea9a4	[tx-robot] updated from transifex	2016-05-30 02:41:51 -04:00
Daniel Molkentin	0194ebb222	Don't try to determine pixel ratio with Qt < 5.6.0 This seems to be broken. Worst case users can still set it manually Addresses #4840	2016-05-30 08:27:57 +02:00
Jenkins for ownCloud	dc654ac846	[tx-robot] updated from transifex	2016-05-29 02:18:52 -04:00
Jenkins for ownCloud	370fd5062c	[tx-robot] updated from transifex	2016-05-28 02:19:09 -04:00
Daniel Molkentin	00d20b4a42	Merge pull request #4913 from owncloud/normalize_name_in_filestatus Undo regression caused by `727e73d`	2016-05-27 18:08:08 +02:00
Daniel Molkentin	a2b238e2e5	Undo regression caused by `727e73d` normalization to NFC is still required. Mac OS API will not take care of that by default. Resolves #4884	2016-05-27 16:03:59 +02:00
ckamm	0e2c16e827	Certs: Re-ask for different cert after rejection #4898 (#4911 ) Previously rejecting any kind of certificate meant that the user was never asked again, even if the certificate changed. Now we keep track of which certificates were rejected and ask again if the ones mentioned in the ssl errors change. mitmproxy is excellent for testing this.	2016-05-27 12:08:42 +02:00
ckamm	b9fdae6d67	Progress: Don't count items without propagation jobs #4856 (#4910 ) * Progress: Don't count dirs without propagation jobs #4856 These directory SyncFileItems are necessary for bookkeeping but should not influence the progress display at all. * Progress: Skip ignored files #4856	2016-05-27 10:52:00 +02:00
Jenkins for ownCloud	c34115610e	[tx-robot] updated from transifex	2016-05-27 02:19:21 -04:00
Olivier Goffart	275ad1e157	Utility: Better fix for the translation of minutes, seconds, ... The plural was not translated because of QTBUG-3945. Work around it. Issue #4855	2016-05-26 12:17:16 +02:00
Jenkins for ownCloud	1855950fa1	[tx-robot] updated from transifex	2016-05-26 02:33:30 -04:00
Olivier Goffart	fff5c280b3	SyncEngine: cleanup setting isDirectory	2016-05-25 16:27:40 +02:00
Olivier Goffart	e960b265a8	Merge remote-tracking branch '2.1' into 2.2	2016-05-25 16:23:58 +02:00
Olivier Goffart	f6b35e5d58	SyncEngine: invalid the blacklist entry when the rename destination change The problem in this case is if we rename the file "xxx" to "invalid\file". The rename will fail because the new filename constains a slash, and it will be blacklisted. But then if the user re-rename the file to "valid_name", then we should invalidate the blacklist entry and retry to upload. But we did not do that because renaming don't change the mtime and we did not store the rename target in the database IL issue 558	2016-05-25 15:32:45 +02:00
Jenkins for ownCloud	1d93af5f64	[tx-robot] updated from transifex	2016-05-25 02:19:18 -04:00
Markus Goetz	75efa8b252	sqlite: Update bundled version to 3.13.0 For OS X and Windows.	2016-05-24 17:27:31 +02:00
Markus Goetz	009a0b03da	Add ChangeLog for 2.2.1	2016-05-24 17:04:04 +02:00
Jenkins for ownCloud	8379a36a75	[tx-robot] updated from transifex	2016-05-24 07:40:14 -04:00
Daniel Molkentin	2f1a40ff7c	Travis coverity: Enforce Ubuntu 14.04 env, fix repo	2016-05-24 11:30:03 +02:00
Daniel Molkentin	c041ca6163	Fix pot. mem leak found by coverity (CID 96004)	2016-05-24 11:21:33 +02:00
Daniel Molkentin	eacc0c8bd6	Fix pot. mem leak found by coverity (CID 12900)	2016-05-24 11:21:33 +02:00
Jenkins for ownCloud	171de99e00	[tx-robot] updated from transifex	2016-05-24 02:19:53 -04:00
ckamm	bf02ccc1e8	Remember to upload files that are locked during a sync run (#4865 ) See owncloud/enterprise#1342	2016-05-23 09:03:03 +02:00
Jenkins for ownCloud	7ba961c21a	[tx-robot] updated from transifex	2016-05-23 02:19:05 -04:00
Jenkins for ownCloud	cb7be78352	[tx-robot] updated from transifex	2016-05-22 02:19:13 -04:00
Jenkins for ownCloud	6cb194e0d5	[tx-robot] updated from transifex	2016-05-21 02:19:09 -04:00
Markus Goetz	552ba94c41	SyncEngine: Set isDirectory before syncItemDiscovered (cherry picked from commit `fc1933803e`)	2016-05-20 17:00:22 +02:00
Markus Goetz	fc1933803e	SyncEngine: Set isDirectory before syncItemDiscovered	2016-05-20 16:58:44 +02:00
Markus Goetz	46e4ec3183	Checksums: Use SHA1 like in >=2.2	2016-05-20 16:31:47 +02:00
Olivier Goffart	03e3b3bf50	Upload: put the job in the active list while doing the checksum computation. This fixes an issue in which too many jobs are started un parallel while uploading many files, which could cause too much memory usage as the chunks are stored in memory. Probably the fix for #4611	2016-05-20 16:28:27 +02:00
Christian Kamm	9aed8dbce8	Checksums: Compute content checksum on download #4375 Cherry-picked from `d6d35029`	2016-05-20 16:06:30 +02:00
ckamm	c6794cd338	Progress info: Reset between syncs #4856 (PR #4872 )	2016-05-20 15:07:54 +02:00
Jenkins for ownCloud	65ec1b74d5	[tx-robot] updated from transifex	2016-05-20 02:19:16 -04:00
Jenkins for ownCloud	1a3c9a9c1a	[tx-robot] updated from transifex	2016-05-19 02:19:20 -04:00
Markus Goetz	a038c99232	Upload: Remove bandwidth quota debug message #4837	2016-05-18 16:18:13 +02:00
Olivier Goffart	30c8fa1c93	Utility: Fix translation of second, minute, hour Issue #4855 A typo in the context string made the translation lookup fail. But also the %Ln was not recognized as a plural form by transifex, so only the singular was translated	2016-05-18 10:52:22 +02:00
Olivier Goffart	010649f997	FolderWizard: remove dead code and fix the alias Remove a bunch of dead code. And also set the root folder name properly since alias is gone. Fix the warning: QWizard::field: No such field 'alias'	2016-05-18 10:52:22 +02:00
Jenkins for ownCloud	597f2a4dfc	[tx-robot] updated from transifex	2016-05-18 02:19:16 -04:00
Olivier Goffart	cf1fe690a3	Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set Help to debug https://github.com/owncloud/enterprise/issues/1265	2016-05-17 12:29:20 +02:00
Jenkins for ownCloud	31b27bea38	[tx-robot] updated from transifex	2016-05-17 02:18:59 -04:00
Jenkins for ownCloud	04f99f3bd7	[tx-robot] updated from transifex	2016-05-15 02:19:07 -04:00
Jenkins for ownCloud	fbf92ac239	[tx-robot] updated from transifex	2016-05-14 02:19:15 -04:00
hefee	669a72f0e1	A final release version number breaks this regex (#4835 ) f.ex. a valid verson nr: 2.2.0 -> fist \d+ = 2 -> second \d+ = 2 -> the last \d+ = 0 -> .+ in not matching, because there is nothing to match	2016-05-13 16:55:11 +02:00
Jenkins for ownCloud	2f0e65d37c	[tx-robot] updated from transifex	2016-05-13 02:25:05 -04:00
Olivier Goffart	5676685f58	SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do IL issue 550	2016-05-12 13:15:30 +02:00
Christian Kamm	db9ccb40a4	Fix compile with strict C flags	2016-05-12 13:14:40 +02:00
Christian Kamm	d4c15d2c38	Ignores: expand escapes #4568 (cherry picked from commit `d7bd1300a8`)	2016-05-12 11:53:17 +02:00
Hefee	edb3759684	For tests we do not need a xserver running. Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.	2016-05-12 11:34:21 +02:00
Christian Kamm	0f9c32452c	Protocol: Increase width of timestamp column #4721 Since the font metrics aren't reliable on windows, we add some extra space there.	2016-05-12 10:24:34 +02:00
Daniel Molkentin	45dd1d0acf	Bump to 2.2.1	2016-05-12 09:58:12 +02:00
Daniel Molkentin	552af7b94d	2.2.0 final	2016-05-12 09:58:12 +02:00
Christian Kamm	8934979ba1	timeAgo test: Fix for qt4, clean up	2016-05-12 09:25:15 +02:00
Daniel Molkentin	b3e16e0eb0	Merge pull request #4825 from owncloud/22-user-manual [Doc] 2.2 user manual updates	2016-05-12 08:20:55 +02:00
Carla Schroder	7773380deb	update file manager screenshot	2016-05-11 12:44:27 -07:00
Carla Schroder	e22050a434	updates to 2.2 user manual	2016-05-11 12:37:40 -07:00
Daniel Molkentin	7b0231bfce	Merge pull request #4821 from owncloud/notification_doc Documentation draft to introduce notifications.	2016-05-11 21:16:35 +02:00
Jocelyn Turcotte	edc58c045f	Fix assert on restore after propagation (#4823 ) The assert was there to make sure that this case wasn't happening to eventually be properly tested. Remove the assert for now but this codepath should eventually be unit tested using this specific situation.	2016-05-11 18:16:46 +02:00
Klaas Freitag	035058934f	Documentation draft to introduce notifications. Also added a screenshot.	2016-05-11 11:16:08 +02:00
Klaas Freitag	9b1f46e560	Fix exclude unit test, adopt to new Iface of isExcluded.	2016-05-10 16:46:08 +02:00
Klaas Freitag	9e7a8e619b	Fix utility test: Pass a command name to do the version check.	2016-05-10 16:26:42 +02:00
Klaas Freitag	9c0cd2b13e	Added Changelog for 2.2.0	2016-05-10 15:39:44 +02:00
Daniel Molkentin	58ad781bd4	Update binary submodule	2016-05-10 14:39:22 +02:00
Daniel Molkentin	9d6701ecbe	Windows Shell Integration: Fix another spot where the pipe path was constructed manually	2016-05-10 13:49:14 +02:00
Daniel Molkentin	d659c54798	Update binary sub module	2016-05-10 10:36:49 +02:00
Daniel Molkentin	0e9170cb36	Windows Shell Integration: Unify path lookups	2016-05-10 10:18:53 +02:00
Markus Goetz	8820bc1c17	Windows: Fix Share menu #4781	2016-05-09 14:37:46 +02:00
Jenkins for ownCloud	74f67c97a9	[tx-robot] updated from transifex	2016-05-09 02:19:15 -04:00
Jenkins for ownCloud	fd96b482c5	[tx-robot] updated from transifex	2016-05-07 02:19:16 -04:00
Jocelyn Turcotte	727e73d640	[shell/windows] Fix the windows status push not working (#4784 ) Since the windows implementation first does cache lookups using the path string, directories need to be passed identically as through RETRIEVE_FILE_STATUS. Change the convention to never have a trailing slash for directories in the protocol. This allows the convention to be applied without having to access the disk (since we'd need to know if the path is represented by a directory) and also matches the convention of the rest of the sync engine. Individual file manager plugins are then responsible of handling pushed paths as not ending with a trailing slash. This also: - Moves the trailing slash removal logic from the SyncFileStatusTracker to the SocketApi class - Remove the unneeded QString::normalized call in fileStatus, since this should already be done by the FolderWatcher and plugins	2016-05-06 12:32:01 +02:00
Jenkins for ownCloud	d7804d8df3	[tx-robot] updated from transifex	2016-05-06 02:19:00 -04:00
Olivier Goffart	3d9d106bb1	Dolphin plugin: fix build with branding Make sure that the name of the _export.h file is the same no matter the plugin	2016-05-04 14:19:18 +02:00
Jenkins for ownCloud	15dc3408ef	[tx-robot] updated from transifex	2016-05-04 02:19:15 -04:00
Markus Goetz	928643f597	NSIS: Properly uninstall both x64 and x86 DLLs #4762 Viel hilft viel ;-)	2016-05-03 18:35:01 +02:00
Markus Goetz	7110091fdd	Qt patches: Update with information about Qt 5.6	2016-05-03 15:16:07 +02:00
Jocelyn Turcotte	064c2b678a	Merge branch 'overlayIconFixes' into 2.2 (#4765 )	2016-05-03 13:04:34 +02:00
Jocelyn Turcotte	e58739de00	[osx] Fix missing overlay icons on client startup Since the statuses are cached and that we can't invalidate the cache, sending NOP would need to be overwritten by the default OK status once the client successfully connected. But instead of remembering which files we NOPed, rather wait until we are ready to sync before sending the REGISTER_PATH message to the socket API client. It will also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS requests. Also remove AccountState::canSync, since it does the same as isConnected and syncing is not an account responsibility.	2016-05-03 13:01:51 +02:00
Jocelyn Turcotte	7c2fdee78b	Avoid a SyncFileStatusTracker private overload with the same name Having an overload as a private function in the same class makes the code harder to follow. Rename the private fileStatus to syncFileItemStatus.	2016-05-03 13:01:51 +02:00
Jocelyn Turcotte	7bfe46962f	Simplify the root status logic Go through fileStatus like other cases to make sure that all use cases go through the same code path. This also makes sure to use lookupProblem which will use lower_bound which is more efficient for larger sets of sync problems. This also fixes the issue with lookupProblem that prevented it to properly match an empty pathToMatch, caused by the fact that the problem map contains relative paths not starting with a slash.	2016-05-03 13:01:51 +02:00
Jocelyn Turcotte	32b3023a8e	Fix the root item sync status #4682 Make sure that we push the new status when the status of the SyncEngine changed. SyncEngine::started comes a bit late, only when the propagation starts, although it's better in this case since child folders will only switch to Sync in aboutToPropagate. Also fix an issue with SyncEngine::findSyncItem when using an empty fileName; this would match and return the wrong item, even though not currently happening with the code since fileStatus won't call it with an empty fileName anymore.	2016-05-03 13:01:51 +02:00
Jocelyn Turcotte	a5df44c757	Fix the sync status push for parent directories #4682 As before, we rely on metadata-update SyncFileItem entries for parent directories to notify us that a directory contains files to propagate, and to know when all children were propagated through its itemCompleted signal. Those metadata SyncFileItems however have a None direction and we need to add a explicit directory check to show them as Sync. This fix also handles new files as well as existing ones, so no need to keep a separate logic for new files.	2016-05-03 13:01:51 +02:00
Klaas Freitag	641125eac1	Fix nautilus and nemo plugin branding strings. (#4780 ) * Fix nautilus and nemo plugin branding strings. Fix for owncloud/enterprise#1314 * nautilus plugin: Add a comment why the line needs to stay unchanged.	2016-05-03 11:36:56 +02:00
Jenkins for ownCloud	d340017a0a	[tx-robot] updated from transifex	2016-05-03 02:19:16 -04:00
Olivier Goffart	a67173610d	Propagator: fix qt4 build propagatedownload.cpp:712:35: error: 'seenLockedFile' is a protected member of 'OCC::OwncloudPropagator' Signals are protected in Qt4 but public in Qt5, mark the class accessing it as friend when compiling with Qt4	2016-05-02 17:34:21 +02:00