TrayNotification: Add Alert classes for error, warning etc.

For that, the logger needs to pass through the notification type that it wants to display. The snore notifications show specific icons for each type.
Systray: Broadcast notifications using libsnore if available.
2016-05-06 17:26:40 +02:00 · 2016-05-06 14:50:09 +02:00 · 2016-05-06 14:50:09 +02:00 · 2016-05-06 14:50:09 +02:00
@@ -1,21 +1,15 @@
-sudo: required
-
 language: cpp
-
-services:
-  - docker
-
 branches:
  only:
  - coverity_scan 

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

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

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

 find_package(ZLIB)

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

 configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
@@ -1,33 +1,5 @@
 ChangeLog
 =========
-version 2.2.1 (release 2016-05-xx)
- * Fix out of memory error when too many uploads happen (#4611)
- * Fix display errors in progress display (#4803 #4856)
- * LockWatcher: Remember to upload files after they become unlocked (#4865) 
-
-version 2.2.0 (release 2016-05-12)
- * Overlay icons: Refactoring - mainly for performance improvements
- * Improved error handling with Sync Journal on USB storages (#4632)
- * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
- * Show server notifications on the client (#3733)
- * Improved Speed with small files by dynamic parallel request count (#4529)
- * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
- * Improved handling of Win32 file locks and network files
- * Workaround Ubuntu 16.04 tray icon bug (#4693)
- * Removed the Alias field from the folder definition (#4695)
- * Improved netrc parser (#4691)
- * Improved user notifications about ignored files and conflicts (#4761, #3222)
- * Add warnings for old server versions (#4523)
- * Enable tranportation checksums if the server supports based on server capabilities (#3735)
-
- * Default Chunk-size changed to 10MB (#4354)
- * Documentation Improvements, ie. about overlay icons
- * Translation fixes
- * Countless other bugfixes
- * Sqlite Update to recent version
- * Update of QtKeyChain to support Windows credential store
- * Packaging of dolphin overlay icon module for bleeding edge distros
-
 version 2.1.1 (release 2016-02-10)
 * UI improvements for HiDPI screens, error messages, RTL languages
 * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
@@ -1,5 +1,5 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 3 )
+set( MIRALL_VERSION_MINOR 2 )
 set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )
@@ -30,7 +30,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z
 StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
 StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na ve slo§ce '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
 StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
 StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
 StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
@@ -3,12 +3,12 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Existem ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine automaticamente?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."
+StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que você desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente da aplicação ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.$\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
@@ -25,12 +25,12 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "A criar atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "O essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Atalho de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho do ambiente de trabalho para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho no ambiente de trabalho de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho de início rápido de ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "A escrever o Desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "A escrever chaves de registo do instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Não parece que a aplicação ${APPLICATION_NAME} esteja instalada no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação cancelada pelo utilizador"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.$\n$\nVälj den åtgärd du vill utföra och klicka på Nästa för att fortsätta."
 StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
@@ -41,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver adm
 StrCpy $UAC_ERROR_LOGON_SERVICE "Login-service körs inte, avbryter!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -270,7 +270,6 @@ 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;
    }
@@ -31,13 +31,6 @@ use strict;

 print "Hello, this is t6, a tester for csync with ownCloud.\n";

-# Checking CURL is installed to avoid misleading errors later...
-system(("curl", "--help", ">", "/dev/null"));
-if ($? != 0) {
-   print "CURL is needed for this script, aborting with error\n";
-   exit 1;
-}
-
 initTesting();

 sub createPostUpdateScript($)
@@ -41,7 +41,7 @@ master_doc = 'index'

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

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

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

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

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

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

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

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

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

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

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

 .. figure:: images/client-7.png
   :alt: Extra options for sync operations
@@ -117,10 +125,12 @@ Folder Sync Connection**.
 Adding New Accounts
 ^^^^^^^^^^^^^^^^^^^

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

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

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

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

 General Window
 --------------
@@ -40,7 +40,7 @@ logs.

 1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
 (On Windows using `cmd.exe`, you might need to first `cd` into the ownCloud directory)
-(See also http://doc.owncloud.org/desktop/2.2/troubleshooting.html#client-logfile )
+(See also http://doc.owncloud.org/desktop/1.8/troubleshooting.html#client-logfile )

 2. Web server error log:

@@ -11,98 +11,11 @@ X-GNOME-Autostart-Delay=3


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

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

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

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

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

 #include <fstream> 

-#define DEFAULT_BUFLEN 4096
+#define BUFSIZE 1024

 using namespace std;

-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;
-}
+#define DEFAULT_BUFLEN 4096

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

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

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

 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 = CommunicationSocket::DefaultPipePath();
+    auto pipename = std::wstring(L"\\\\.\\pipe\\");
+    pipename += L"ownCloud\\";
+    pipename += getUserName();
+
    bool connected = false;
    CommunicationSocket socket;
    std::unordered_set<std::wstring> asked;
@@ -28,12 +28,16 @@
 * \return string PEM
 */
 string x509ToString(BIO *o) {
+    int len = 0;
    BUF_MEM *bptr;
+    void* data;
+    string ret = "";
+    
    BIO_get_mem_ptr(o, &bptr);
-    int len = bptr->length;
-    void* data = calloc(len+10, sizeof(char));
+    len = bptr->length;
+    data = calloc(len+10, sizeof(char));
    BIO_read(o, data, len);
-    string ret = std::string(static_cast<char*>(data));
+    ret = strdup((char*)data);
    free(data);
        
    return ret;
@@ -45,7 +45,7 @@ qt_wrap_ui(client_UI_SRCS ${client_UI})
 set(client_SRCS
    accountmanager.cpp
    accountsettings.cpp
-    application.cpp
+    ocapplication.cpp
    folder.cpp
    folderman.cpp
    folderstatusmodel.cpp
@@ -72,7 +72,6 @@ set(client_SRCS
    settingsdialog.cpp
    share.cpp
    sharedialog.cpp
-    shareemailwidget.cpp
    sharelinkwidget.cpp
    shareusergroupwidget.cpp
    sharee.cpp
@@ -213,6 +212,10 @@ if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND)
    list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
    include_directories(${QTKEYCHAIN_INCLUDE_DIR})
 endif()
+if(LibsnoreQt5_FOUND)
+    add_definitions(-DHAVE_LIBSNORE)
+
+endif()

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

 if(WITH_CRASHREPORTER)
    target_link_libraries( ${APPLICATION_EXECUTABLE} crashreporter-handler)
@@ -21,7 +21,7 @@
 #include "folderstatusmodel.h"
 #include "folderstatusdelegate.h"
 #include "utility.h"
-#include "application.h"
+#include "ocapplication.h"
 #include "configfile.h"
 #include "account.h"
 #include "accountstate.h"
@@ -248,9 +248,6 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
    QHash<QString, int> accNotified;
    QString listAccountName;

-    // Whether a new notification widget was added to the notificationLayout.
-    bool newNotificationShown = false;
-
    foreach( auto activity, list ) {
        if( _blacklistedNotifications.contains(activity)) {
            qDebug() << Q_FUNC_INFO << "Activity in blacklist, skip";
@@ -274,7 +271,6 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
            _ui->_notifyScroll->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContentsOnFirstShow);
 #endif
            _widgetForNotifId[activity.ident()] = widget;
-            newNotificationShown = true;
        }

        widget->setActivity( activity );
@@ -369,10 +365,6 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
        const QString log = tr("%1 Notifications - Action Required").arg(Theme::instance()->appNameGUI());
        emit guiLog( log, msg);
    }
-
-    if (newNotificationShown) {
-        emit newNotification();
-    }
 }

 void ActivityWidget::slotSendNotificationRequest(const QString& accountName, const QString& link, const QByteArray& verb)
@@ -525,7 +517,6 @@ ActivitySettings::ActivitySettings(QWidget *parent)
    connect(_activityWidget, SIGNAL(copyToClipboard()), this, SLOT(slotCopyToClipboard()));
    connect(_activityWidget, SIGNAL(hideActivityTab(bool)), this, SLOT(setActivityTabHidden(bool)));
    connect(_activityWidget, SIGNAL(guiLog(QString,QString)), this, SIGNAL(guiLog(QString,QString)));
-    connect(_activityWidget, SIGNAL(newNotification()), SLOT(slotShowActivityTab()));

    _protocolWidget = new ProtocolWidget(this);
    _tab->insertTab(1, _protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));
@@ -591,13 +582,6 @@ void ActivitySettings::slotShowIssueItemCount(int cnt)
    _tab->setTabText(_syncIssueTabId, cntText);
 }

-void ActivitySettings::slotShowActivityTab()
-{
-    if (_activityTabId != -1) {
-        _tab->setCurrentIndex(_activityTabId);
-    }
-}
-
 void ActivitySettings::slotCopyToClipboard()
 {
    QString text;
@@ -41,7 +41,7 @@ class ActivityListModel;
 namespace Ui {
  class ActivityWidget;
 }
-class Application;
+class oCApplication;

 /**
 * @brief The ActivityWidget class
@@ -81,7 +81,7 @@ signals:
    void copyToClipboard();
    void rowsInserted();
    void hideActivityTab(bool);
-    void newNotification();
+    void newNotificationList(const ActivityList& list);

 private slots:
    void slotBuildNotificationDisplay(const ActivityList& list);
@@ -143,7 +143,6 @@ private slots:
    void setActivityTabHidden(bool hidden);
    void slotRegularNotificationCheck();
    void slotShowIssueItemCount(int cnt);
-    void slotShowActivityTab();

 signals:
    void guiLog(const QString&, const QString&);
@@ -38,12 +38,7 @@ namespace OCC

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

 namespace OCC {

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

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

@@ -584,7 +584,7 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)
    QStringList sortedSubfolders = list;
    // skip the parent item (first in the list)
    sortedSubfolders.erase(sortedSubfolders.begin());
-    Utility::sortFilenames(sortedSubfolders);
+    sortedSubfolders.sort();

    QVarLengthArray<int, 10> undecidedIndexes;

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

+    QString newAlias = Theme::instance()->appName();
+    int count = 0;
+    while (FolderMan::instance()->folder(newAlias)) {
+        // There is already a folder configured with this name and folder names need to be unique
+        newAlias = Theme::instance()->appName() + QString::number(++count);
+    }
+
    _ui.warnLabel->setTextFormat(Qt::RichText);
    _ui.warnLabel->hide();
 }
@@ -128,6 +135,14 @@ void FolderWizardLocalPath::slotChooseLocalFolder()
    if (!dir.isEmpty()) {
        // set the last directory component name as alias
        _ui.localFolderLineEdit->setText(QDir::toNativeSeparators(dir));
+
+        QDir pickedDir(dir);
+        QString newAlias = pickedDir.dirName();
+        int count = 0;
+        while (FolderMan::instance()->folder(newAlias)) {
+            // There is already a folder configured with this name and folder names need to be unique
+            newAlias = pickedDir.dirName() + QString::number(++count);
+        }
    }
    emit completeChanged();
 }
@@ -308,7 +323,7 @@ void FolderWizardRemotePath::slotUpdateDirectories(const QStringList &list)
        root->setData(0, Qt::UserRole, "/");
    }
    QStringList sortedList = list;
-    Utility::sortFilenames(sortedList);
+    sortedList.sort();
    foreach (QString path, sortedList) {
        path.remove(webdavFolder);
        QStringList paths = path.split('/');
@@ -488,13 +503,11 @@ FolderWizardSelectiveSync::~FolderWizardSelectiveSync()

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

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

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

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

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

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

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

 #include <iostream>

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

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

-Application::Application(int &argc, char **argv) :
+oCApplication::oCApplication(int &argc, char **argv) :
    SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
    _gui(0),
    _theme(Theme::instance()),
@@ -179,8 +179,6 @@ Application::Application(int &argc, char **argv) :

    connect(FolderMan::instance()->socketApi(), SIGNAL(shareCommandReceived(QString, QString, bool)),
            _gui, SLOT(slotShowShareDialog(QString, QString, bool)));
-    connect(FolderMan::instance()->socketApi(), SIGNAL(shareEmailCommandReceived(QString,QString,bool)),
-            _gui, SLOT(slowSendShareLink(QString, QString, bool)));

    // startup procedure.
    connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection()));
@@ -204,7 +202,7 @@ Application::Application(int &argc, char **argv) :
    connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
 }

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

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

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

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

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

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

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

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

 }

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

    bool giveHelp();
    void showHelp();
@@ -11,7 +11,7 @@
 * for more details.
 */

-#include "application.h"
+#include "ocapplication.h"
 #include "owncloudgui.h"
 #include "theme.h"
 #include "folderman.h"
@@ -20,7 +20,6 @@
 #include "progressdispatcher.h"
 #include "owncloudsetupwizard.h"
 #include "sharedialog.h"
-#include "shareemailwidget.h"
 #if defined(Q_OS_MAC)
 #    include "settingsdialogmac.h"
 #    include "macwindow.h" // qtmacgoodies
@@ -48,7 +47,7 @@ namespace OCC {

 const char propertyAccountC[] = "oc_account";

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

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

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

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


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

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

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

-    if (progress.isUpdatingEstimates()
+    if (progress.hasStarted()
            && progress.completedFiles() >= progress.totalFiles()
            && progress._currentDiscoveredFolder.isEmpty()) {
        QTimer::singleShot(2000, this, SLOT(slotDisplayIdle()));
@@ -912,27 +929,5 @@ void ownCloudGui::slotRemoveDestroyedShareDialogs()
    }
 }

-void ownCloudGui::slowSendShareLink(const QString &sharePath, const QString &localPath, bool resharingAllowed)
-{
-    const auto folder = FolderMan::instance()->folderForPath(localPath);
-    if (!folder) {
-        qDebug() << "Could not open share email widget for" << localPath << "no responsible folder found";
-        return;
-    }
-
-    // For https://github.com/owncloud/client/issues/3783
-    _settingsDialog->hide();
-
-    if (!resharingAllowed) {
-        qDebug() << "Could not open share email widget for" << localPath << "no reshare permissions";
-        return;
-    }
-
-    qDebug() << Q_FUNC_INFO << "Opening share email widget" << sharePath << localPath;
-    ShareEmailWidget *w = new ShareEmailWidget(folder->accountState()->account(), sharePath);
-    w->setAttribute( Qt::WA_DeleteOnClose, true );
-    raiseDialog(w);
-}
-

 } // end namespace
@@ -17,6 +17,7 @@
 #include "systray.h"
 #include "connectionvalidator.h"
 #include "progressdispatcher.h"
+#include "logger.h"

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

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

    bool checkAccountExists(bool openSettings);

@@ -58,8 +59,8 @@ signals:
 public slots:
    void setupContextMenu();
    void slotComputeOverallSyncStatus();
-    void slotShowTrayMessage(const QString &title, const QString &msg);
-    void slotShowOptionalTrayMessage(const QString &title, const QString &msg);
+    void slotShowTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type);
+    void slotShowOptionalTrayMessage(const QString &title, const QString &msg, Logger::NotificationType type);
    void slotFolderOpenAction( const QString& alias );
    void slotRebuildRecentMenus();
    void slotUpdateProgress(const QString &folder, const ProgressInfo& progress);
@@ -79,7 +80,6 @@ public slots:
    void slotTrayMessageIfServerUnsupported(Account *account);
    void slotShowShareDialog(const QString &sharePath, const QString &localPath, bool resharingAllowed);
    void slotRemoveDestroyedShareDialogs();
-    void slowSendShareLink(const QString &sharePath, const QString &localPath, bool resharingAllowed);

 private slots:
    void slotDisplayIdle();
@@ -123,7 +123,7 @@ private:
    QSignalMapper *_folderOpenActionMapper;
    QSignalMapper *_recentItemsMapper;

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

 } // namespace OCC
@@ -57,15 +57,9 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
    header << tr("Action");
    header << tr("Size");

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

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

 /**
 * @brief The ProtocolWidget class
@@ -222,7 +222,7 @@ void SelectiveSyncTreeView::slotUpdateDirectories(QStringList list)
        }
    }

-    Utility::sortFilenames(list);
+    list.sort();
    foreach (QString path, list) {
        auto size = job ? job->_sizes.value(path) : 0;
        path.remove(pathToRemove);
@@ -33,7 +33,7 @@ namespace Ui {
 class SettingsDialog;
 }
 class AccountSettings;
-class Application;
+class oCApplication;
 class FolderMan;
 class ownCloudGui;
 class ActivitySettings;
@@ -1,59 +0,0 @@
-#include "shareemailwidget.h"
-#include "share.h"
-
-#include <QDesktopServices>
-#include <QSharedPointer>
-#include <QUrl>
-
-namespace OCC {
-
-ShareEmailWidget::ShareEmailWidget(AccountPtr account,
-                                   const QString &sharePath,
-                                   QWidget *parent)
-    : QWidget(parent),
-     _account(account),
-     _sharePath(sharePath)
-{
-    resize(200,200);
-
-    _layout.addWidget(&_spinner);
-    _layout.addWidget(&_label);
-
-    _label.setText(tr("Fetching share link"));
-    _spinner.startAnimation();
-
-    setLayout(&_layout);
-
-    /*
-     * Create the share manager and connect it properly
-     */
-    _manager = new ShareManager(_account, this);
-    connect(_manager, SIGNAL(linkShareCreated(QSharedPointer<LinkShare>)), this, SLOT(slotLinkShareCreated(QSharedPointer<LinkShare>)));
-
-    _manager->createLinkShare(_sharePath);
-}
-
-ShareEmailWidget::~ShareEmailWidget()
-{
-
-}
-
-void ShareEmailWidget::slotLinkShareCreated(const QSharedPointer<LinkShare> share)
-{
-    QUrl mailto("mailto:");
-
-    QString body = tr("I shared a file with you at %1.").arg(share->getLink().toString());
-
-    if (share->getExpireDate().isValid()) {
-        body += tr("\nThis share expires at %1.").arg(share->getExpireDate().toString());
-    }
-
-    mailto.setQuery("body?"+body);
-
-    // Open app
-    QDesktopServices::openUrl(mailto);
-
-    close();
-}
-
-}
@@ -1,46 +0,0 @@
-#ifndef SHAREEMAILDIALOG_H
-#define SHAREEMAILDIALOG_H
-
-#include "accountfwd.h"
-#include "QProgressIndicator.h"
-#include "share.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSharedPointer>
-#include <QString>
-#include <QWidget>
-
-namespace OCC {
-
-class ShareManager;
-
-class ShareEmailWidget : public QWidget
-{
-public:
-
-    explicit ShareEmailWidget(AccountPtr account,
-                              const QString &sharePath,
-                              QWidget *parent = 0);
-    ~ShareEmailWidget();
-
-private slots:
-    void slotLinkShareCreated(const QSharedPointer<LinkShare> share);
-    void slotPasswordEnterd();
-    void slotPasswordRequired();
-
-private:
-    void share(const QString &sharePath, const QString &password);
-
-    AccountPtr _account;
-    QString _sharePath;
-
-    QHBoxLayout _layout;
-    QLabel _label;
-    QProgressIndicator _spinner;
-
-    ShareManager *_manager;
-};
-
-}
-#endif // SHAREEMAILDIALOG_H
@@ -72,7 +72,9 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,

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

    _manager = new ShareManager(_account, this);
@@ -56,13 +56,6 @@
 // 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: "
@@ -149,7 +142,7 @@ void SocketApi::slotNewConnection()

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

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

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

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

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

-            broadcastMessage(QLatin1String("UPDATE_VIEW"), rootPath);
+            broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
        } else {
            qDebug() << "Not sending UPDATE_VIEW for" << f->alias() << "because status() is" << f->syncResult().status();
        }
@@ -310,12 +302,8 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice*
        // this can happen in offline mode e.g.: nothing to worry about
        statusString = QLatin1String("NOP");
    } else {
-        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);
+        const QString file = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
+        SyncFileStatus fileStatus = syncFolder->syncEngine().syncFileStatusTracker().fileStatus(file);

        statusString = fileStatus.toSocketAPIString();
    }
@@ -453,66 +441,6 @@ void SocketApi::command_SHARE_MENU_TITLE(const QString &, QIODevice* socket)
    sendMessage(socket, QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
 }

-void SocketApi::command_SHARE_EMAIL(const QString& localFile, QIODevice* socket)
-{
-    if (!socket) {
-        qDebug() << Q_FUNC_INFO << "No valid socket object.";
-        return;
-    }
-
-    qDebug() << Q_FUNC_INFO << localFile;
-
-    auto theme = Theme::instance();
-
-    Folder *shareFolder = FolderMan::instance()->folderForPath(localFile);
-    if (!shareFolder) {
-        const QString message = QLatin1String("SHARE_EMAIL:NOP:")+QDir::toNativeSeparators(localFile);
-        // files that are not within a sync folder are not synced.
-        sendMessage(socket, message);
-    } else if (!shareFolder->accountState()->isConnected()) {
-        const QString message = QLatin1String("SHARE_EMAIL:NOTCONNECTED:")+QDir::toNativeSeparators(localFile);
-        // if the folder isn't connected, don't open the share dialog
-        sendMessage(socket, message);
-    } else if (!theme->linkSharing()) {
-        const QString message = QLatin1String("SHARE_EMAIL:NOP:")+QDir::toNativeSeparators(localFile);
-        sendMessage(socket, message);
-    } else {
-        const QString localFileClean = QDir::cleanPath(localFile);
-        const QString file = localFileClean.mid(shareFolder->cleanPath().length()+1);
-        SyncFileStatus fileStatus = shareFolder->syncEngine().syncFileStatusTracker().fileStatus(file);
-
-        // Verify the file is on the server (to our knowledge of course)
-        if (fileStatus.tag() != SyncFileStatus::StatusUpToDate) {
-            const QString message = QLatin1String("SHARE:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
-            sendMessage(socket, message);
-            return;
-        }
-
-        const QString remotePath = QDir(shareFolder->remotePath()).filePath(file);
-
-        // Can't share root folder
-        if (remotePath == "/") {
-            const QString message = QLatin1String("SHARE_EMAIL:CANNOTSHAREROOT:")+QDir::toNativeSeparators(localFile);
-            sendMessage(socket, message);
-            return;
-        }
-
-        SyncJournalFileRecord rec = shareFolder->journalDb()->getFileRecord(localFileClean);
-
-        bool allowReshare = true; // lets assume the good
-        if( rec.isValid() ) {
-            // check the permission: Is resharing allowed?
-            if( !rec._remotePerm.contains('R') ) {
-                allowReshare = false;
-            }
-        }
-        const QString message = QLatin1String("SHARE_EMAIL:OK:")+QDir::toNativeSeparators(localFile);
-        sendMessage(socket, message);
-
-        emit shareEmailCommandReceived(remotePath, localFileClean, allowReshare);
-    }
-}
-
 QString SocketApi::buildRegisterPathMessage(const QString& path)
 {
    QFileInfo fi(path);
@@ -56,7 +56,6 @@ public slots:
 signals:
    void shareCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);
    void shareUserGroupCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);
-    void shareEmailCommandReceived(const QString &sharePath, const QString &localPath, bool resharingAllowed);

 private slots:
    void slotNewConnection();
@@ -71,7 +70,6 @@ private:
    Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, QIODevice* socket);
    Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, QIODevice* socket);
    Q_INVOKABLE void command_SHARE(const QString& localFile, QIODevice* socket);
-    Q_INVOKABLE void command_SHARE_EMAIL(const QString& localFile, QIODevice* socket);

    Q_INVOKABLE void command_VERSION(const QString& argument, QIODevice* socket);

@@ -12,9 +12,15 @@
 * for more details.
 */

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

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

 namespace OCC {

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

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

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

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

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

 } // namespace OCC
@@ -74,14 +74,14 @@ Logger::~Logger() {
 }


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

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

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

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

  static Logger* instance();

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

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

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

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

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

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

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

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

-bool ProgressInfo::isUpdatingEstimates() const
+bool ProgressInfo::hasStarted() const
 {
    return _updateEstimatesTimer.isActive();
 }
@@ -37,27 +37,27 @@ class OWNCLOUDSYNC_EXPORT ProgressInfo : public QObject
 {
    Q_OBJECT
 public:
-    ProgressInfo();
-
-    /** Resets for a new sync run.
-     */
-    void reset();
+    ProgressInfo()
+        : _totalSizeOfCompletedJobs(0)
+        , _maxFilesPerSecond(2.0)
+        , _maxBytesPerSecond(100000.0)
+    {}

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

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

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

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

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

    // remember the modtime before checksumming to be able to detect a file
@@ -272,10 +274,6 @@ 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;

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

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

 }

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

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

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

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

-SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
+SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& systemFileName)
 {
-    Q_ASSERT(!relativePath.endsWith(QLatin1Char('/')));
+    QString fileName = systemFileName.normalized(QString::NormalizationForm_C);
+    if( fileName.endsWith(QLatin1Char('/')) ) {
+        fileName.truncate(fileName.length()-1);
+        qDebug() << "Removed trailing slash: " << fileName;
+    }

-    if (relativePath.isEmpty()) {
+    if( fileName.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());
    }
@@ -107,22 +111,22 @@ SyncFileStatus SyncFileStatusTracker::fileStatus(const QString& relativePath)
    // update the exclude list at runtime and doing it statically here removes
    // our ability to notify changes through the fileStatusChanged signal,
    // it's an acceptable compromize to treat all exclude types the same.
-    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + relativePath,
+    if( _syncEngine->excludedFiles().isExcluded(_syncEngine->localPath() + fileName,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

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

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

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

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

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

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

 void SyncFileStatusTracker::slotSyncEngineRunningChanged()
@@ -231,19 +236,20 @@ 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(getSystemDestination(parentPath), fileStatus(parentPath));
+        emit fileStatusChanged(_syncEngine->localPath() + parentPath, fileStatus(parentPath));
    }
 }

-QString SyncFileStatusTracker::getSystemDestination(const QString& relativePath)
+QString SyncFileStatusTracker::getSystemDestination(const SyncFileItem& item)
 {
-    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);
+    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('/');
    }
-    return systemPath;
+    return systemFileName;
 }

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

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

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

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

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

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

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

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

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

    QString    _file;
-    QString    _renameTarget;

    bool isValid() const;

@@ -35,10 +35,6 @@
 #else
 #include <QStandardPaths>
 #endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-#include <QCollator>
-#endif
-

 #ifdef Q_OS_UNIX
 #include <sys/statvfs.h>
@@ -310,17 +306,17 @@ namespace {
        QString description(quint64 value) const
        {
            return QCoreApplication::translate(
-                    "Utility", name, 0, QCoreApplication::UnicodeUTF8,
+                    "Utiliy", name, 0, QCoreApplication::UnicodeUTF8,
                    value);
        }
    };
    Q_DECL_CONSTEXPR Period periods[] = {
-        { QT_TRANSLATE_NOOP("Utility", "%n year(s)") , 365*24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%n month(s)") , 30*24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%n day(s)") , 24*3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%n hour(s)") , 3600*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%n minute(s)") , 60*1000LL },
-        { QT_TRANSLATE_NOOP("Utility", "%n second(s)") , 1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln hour(s)") , 3600*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln minute(s)") , 60*1000LL },
+        { QT_TRANSLATE_NOOP("Utility", "%Ln second(s)") , 1000LL },
        { 0, 0 }
    };
 } // anonymous namespace
@@ -545,16 +541,4 @@ quint64 Utility::StopWatch::durationOfLap( const QString& lapName ) const
    return _lapTimes.value(lapName, 0);
 }

-void Utility::sortFilenames(QStringList& fileNames)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-    QCollator collator;
-    collator.setNumericMode(true);
-    collator.setCaseSensitivity(Qt::CaseInsensitive);
-    qSort(fileNames.begin(), fileNames.end(), collator);
-#else
-    fileNames.sort(Qt::CaseInsensitive);
-#endif
-}
-
 } // namespace OCC
@@ -136,11 +136,6 @@ namespace Utility
        quint64 durationOfLap( const QString& lapName ) const;
    };

-    /**
-     * @brief Sort a QStringList in a way that's appropriate for filenames
-     */
-    OWNCLOUDSYNC_EXPORT void sortFilenames(QStringList& fileNames);
-
 }
 /** @} */ // \addtogroup

@@ -11,7 +11,7 @@ macro(owncloud_add_test test_class additional_cpp)
    string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)

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

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

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

 };

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

 };

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

-        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));
+        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));

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

-        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));
+        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));
    }
 };

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

 };

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

 };

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

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

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

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

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

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

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

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

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

 };

-QTEST_APPLESS_MAIN(TestUpdater)
+QTEST_MAIN(TestUpdater)
 #include "testupdater.moc"
@@ -121,13 +121,11 @@ private slots:
                // Current requires an X-Server
                return;
            }
-            // 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"));
+            QString ver = versionOfInstalledBinary(BIN_PATH);
 	    qDebug() << "Version of installed ownCloud Binary: " << ver;
 	    QVERIFY( !ver.isEmpty());

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

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

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

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

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

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

 };

-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    QTEST_MAIN(TestXmlParse)
-#else
-    QTEST_GUILESS_MAIN(TestXmlParse)
-#endif
-
+QTEST_MAIN(TestXmlParse)
 #include "testxmlparse.moc"
@@ -997,12 +997,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Introduïu la ruta del directori local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Seleccioneu la carpeta font</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crea una carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduïu el nom de la carpeta nova que es crearà a sota &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La carpeta s&apos;ha creat correctament a %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentificació fallida en accedir %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>No s&apos;ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Ha fallat en llistar una carpeta. Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Escolliu-ho per sincronitzar el compte sencer</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Ja s&apos;està sincronitzant aquest directori.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ja esteu sincronitzant &lt;i&gt;%1&lt;/i&gt;, que és una carpeta dins de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Ja esteu sincronitzant tots els vostres fitxers. Sincronitzar una altra carpeta &lt;b&gt;no&lt;/b&gt; està permes. Si voleu sincronitzar múltiples carpetes, elimineu la configuració de sincronització de la carpeta arrel.</translation>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Trieu què sincronitzar: podeu seleccionar opcionalment quines subcarpetes remotes no voleu sincronitzar.</translation>
    </message>
@@ -1952,17 +1952,17 @@ No és aconsellada usar-la.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>El fitxer ha canviat des de que es va descobrir</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -2096,48 +2096,48 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fitxer eliminat</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>El fitxer local ha canviat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>El fitxer s&apos;ha editat localment però és part d&apos;una compartició només de lectura. S&apos;ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>El fitxer local s&apos;ha eliminat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -2180,17 +2180,17 @@ No és aconsellada usar-la.</translation>
        <translation>Mida</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copia la llista d&apos;activitats al porta-retalls.</translation>
    </message>
@@ -2541,17 +2541,17 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticat</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Es requereix nova acreditació</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>La vostra sessió ha vençut. Heu d&apos;acreditar-vos de nou per continuar usant el client.</translation>
    </message>
@@ -2559,7 +2559,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Comparteix amb %1</translation>
@@ -2853,23 +2853,23 @@ No és aconsellada usar-la.</translation>
        <translation>Error en llegir la carpeta.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2889,7 +2889,7 @@ No és aconsellada usar-la.</translation>
        <translation>Aturat per l&apos;usuari</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>El nom del fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
    </message>
@@ -2929,109 +2929,109 @@ No és aconsellada usar-la.</translation>
        <translation>S&apos;ha produït l&apos;error intern número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;element no s&apos;ha sincronitzat degut a errors previs: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>La sincronització d&apos;enllaços simbòlics no està implementada.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fitxer està a la llista d&apos;ignorats.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>El nom de fitxer és massa llarg.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>La codificació del nom de fitxer no és vàlida</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caràcters no vàlids. Reanomeneu &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No es pot inicialitzar un periòdic de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>No es pot obrir el diari de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>S&apos;ignora degut al filtre a «Trieu què sincronitzar»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No es permet l&apos;eliminació, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Fitxers locals i carpeta compartida esborrats.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>No es permet moure&apos;l, l&apos;element es restaura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No es permet moure perquè %1 només és de lectura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>el destí</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>l&apos;origen</translation>
    </message>
@@ -3564,33 +3564,33 @@ No és aconsellada usar-la.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln any/s</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln mes/os</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln dia/es</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln hora/es</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln minut/s</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segon/s</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -17,7 +17,7 @@
    <message>
        <location filename="../src/gui/folderwizardsourcepage.ui" line="33"/>
        <source>Pick a local folder on your computer to sync</source>
-        <translation>Zvolte místní adresář na svém počítači k synchronizaci</translation>
+        <translation>Zvolte místní složku na svém počítači k synchronizaci</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/>
@@ -35,7 +35,7 @@
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/>
        <source>Select a remote destination folder</source>
-        <translation>Zvolte vzdálený cílový adresář</translation>
+        <translation>Zvolte vzdálenou cílovou složku</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/>
@@ -50,7 +50,7 @@
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/>
        <source>Folders</source>
-        <translation>Adresáře</translation>
+        <translation>Složky</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="110"/>
@@ -101,7 +101,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="146"/>
        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
-        <translation>Neoznačené adresáře budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
+        <translation>Neoznačené složky budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="193"/>
@@ -542,7 +542,7 @@
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="128"/>
        <source>Please update to the latest server and restart the client.</source>
-        <translation>Aktualizujte prosím na poslední verzi serveru a restartujte klienta.</translation>
+        <translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="148"/>
@@ -581,7 +581,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="135"/>
        <source>Local folder %1 does not exist.</source>
-        <translation>Místní adresář %1 neexistuje.</translation>
+        <translation>Místní složka %1 neexistuje.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="138"/>
@@ -695,8 +695,8 @@ Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</tran
        <source>This sync would remove all the files in the sync folder '%1'.
 This might be because the folder was silently reconfigured, or that all the files were manually removed.
 Are you sure you want to perform this operation?</source>
-        <translation>Tato synchronizace by smazala všechny soubory v adresáři &apos;%1&apos;.
-Toto může být způsobeno změnou v nastavení synchronizace adresáře nebo tím, že byly všechny soubory ručně odstraněny.
+        <translation>Tato synchronizace by smazala všechny soubory ve složce &apos;%1&apos;.
+Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím, že byly všechny soubory ručně odstraněny.
 Opravdu chcete provést tuto akci?</translation>
    </message>
    <message>
@@ -744,7 +744,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="265"/>
        <source>Could not reset folder state</source>
-        <translation>Nelze obnovit stav adresáře</translation>
+        <translation>Nelze obnovit stav složky</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="266"/>
@@ -824,7 +824,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="1193"/>
        <source>You have no permission to write to the selected folder!</source>
-        <translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation>
+        <translation>Nemáte oprávnění pro zápis do zvolené složky!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1208"/>
@@ -839,17 +839,17 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderman.cpp" line="1220"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte prosím jiný!</translation>
+        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte, prosím, jiný!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1227"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Místní adresář %1 je již obsažen ve adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
+        <translation>Místní adresář %1 je již obsažen ve složce použité pro synchronizaci. Vyberte, prosím, jiný!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1233"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu je již obsažen v adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
+        <translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu je již obsažen v adresáři použitém pro synchronizaci. Vyberte, prosím, jiný!</translation>
    </message>
 </context>
 <context>
@@ -1001,12 +1001,12 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Přidat synchronizaci adresáře</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Přidat synchronizační připojení</translation>
    </message>
@@ -1016,78 +1016,78 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="65"/>
        <source>Click to select a local folder to sync.</source>
-        <translation>Kliknutím zvolíte místní adresář k synchronizaci.</translation>
+        <translation>Kliknutím zvolíte místní složku k synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="69"/>
        <source>Enter the path to the local folder.</source>
-        <translation>Zadejte cestu k místnímu adresáři.</translation>
+        <translation>Zadejte cestu k místní složce.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
-        <translation>Zvolte zdrojový adresář</translation>
+        <translation>Zvolte zdrojovou složku</translation>
    </message>
 </context>
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
-        <translation>Vytvořit vzdálený adresář</translation>
+        <translation>Vytvořit vzdálenou složku</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Zadejte název nově vytvářeného adresáře níže &apos;%1&apos;:</translation>
+        <translation>Zadejte název nově vytvářené složky níže &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
-        <translation>Adresář byl úspěšně vytvořen na %1.</translation>
+        <translation>Složka byla úspěšně vytvořena na %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Ověření selhalo při připojení %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
-        <translation>Na %1 selhalo vytvoření adresáře. Zkontrolujte to prosím ručně.</translation>
+        <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Chyba při vypsání adresáře. Chyba: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Zvolte toto k provedení synchronizace celého účtu</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
-        <translation>Tento adresář je již synchronizován.</translation>
+        <translation>Tato složka je již synchronizována.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
-        <translation>Již synchronizujete adresář &lt;i&gt;%1&lt;/i&gt;, který je adresáři &lt;i&gt;%2&lt;/i&gt; nadřazený.</translation>
+        <translation>Již synchronizujete složku &lt;i&gt;%1&lt;/i&gt;, která je složce &lt;i&gt;%2&lt;/i&gt; nadřazená.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
-        <translation>Již synchronizujete všechny své soubory. Synchronizování dalšího adresáře &lt;b&gt;není&lt;/b&gt; podporováno. Pokud chcete synchronizovat více adresářů, odstraňte prosím synchronizaci aktuálního kořenového adresáře.</translation>
+        <translation>Již synchronizujete všechny své soubory. Synchronizování další složky &lt;b&gt;není&lt;/b&gt; podporováno. Pokud chcete synchronizovat více složek, odstraňte prosím synchronizaci aktuální kořenové složky.</translation>
    </message>
 </context>
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
-        <translation>Výběr synchronizace: Můžete dodatečně označit podadresáře, které si nepřejete synchronizovat.</translation>
+        <translation>Výběr synchronizace: Můžete dodatečně označit podsložky, které si nepřejete synchronizovat.</translation>
    </message>
 </context>
 <context>
@@ -1565,7 +1565,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
        <source>Could not download update. Please click &lt;a href=&apos;%1&apos;&gt;here&lt;/a&gt; to download the update manually.</source>
-        <translation>Nemohu stáhnout aktualizaci. Klikněte prosím na &lt;a href=&apos;%1&apos;&gt;tento odkaz&lt;/a&gt; pro ruční stažení aktualizace.</translation>
+        <translation>Nemohu stáhnout aktualizaci. Klikněte, prosím, na &lt;a href=&apos;%1&apos;&gt;tento odkaz&lt;/a&gt; pro ruční stažení aktualizace.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="147"/>
@@ -1613,7 +1613,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/>
        <source>Setup local folder options</source>
-        <translation>Možnosti nastavení místního adresáře</translation>
+        <translation>Možnosti nastavení místní složky</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="60"/>
@@ -1623,7 +1623,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="139"/>
        <source>%1 folder &apos;%2&apos; is synced to local folder &apos;%3&apos;</source>
-        <translation>%1 adresář &apos;%2&apos; je synchronizován do místního adresáře &apos;%3&apos;</translation>
+        <translation>%1 složka &apos;%2&apos; je synchronizována do místní složky &apos;%3&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1638,7 +1638,7 @@ můžete být požádáni o dodatečná oprávnění.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
        <source>Local Sync Folder</source>
-        <translation>Místní synchronizovaný adresář</translation>
+        <translation>Místní synchronizovaná složka</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
@@ -1768,7 +1768,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
-        <translation>Místní synchronizovaný adresář %1 již existuje, nastavuji jej pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
+        <translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
@@ -1788,12 +1788,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
        <source>Could not create local folder %1</source>
-        <translation>Nelze vytvořit místní adresář %1</translation>
+        <translation>Nelze vytvořit místní složku %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
        <source>No remote folder specified!</source>
-        <translation>Není nastaven žádný vzdálený adresář!</translation>
+        <translation>Žádná vzdálená složka nenastavena!</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
@@ -1803,39 +1803,39 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>creating folder on ownCloud: %1</source>
-        <translation>vytvářím adresář na ownCloudu: %1</translation>
+        <translation>vytvářím složku na ownCloudu: %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
        <source>Remote folder %1 created successfully.</source>
-        <translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation>
+        <translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
-        <translation>Vzdálený adresář %1 již existuje. Spojuji jej pro synchronizaci.</translation>
+        <translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
        <source>The folder creation resulted in HTTP error code %1</source>
-        <translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation>
+        <translation>Vytvoření složky selhalo HTTP chybou %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
-        <translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
+        <translation>Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
-        <translation>Vytváření vzdáleného adresáře %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
+        <translation>Vytváření vzdálené složky %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
@@ -1855,7 +1855,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
        <source>Folder rename failed</source>
-        <translation>Přejmenování adresáře selhalo</translation>
+        <translation>Přejmenování složky selhalo</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
@@ -1865,7 +1865,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaný adresář %1 byl úspěšně vytvořen!&lt;/b&gt;&lt;/font&gt;</translation>
+        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaná složka %1 byla vytvořena úspěšně!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
 </context>
 <context>
@@ -1878,7 +1878,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
        <source>Skip folders configuration</source>
-        <translation>Přeskočit konfiguraci adresářů</translation>
+        <translation>Přeskočit konfiguraci složek</translation>
    </message>
 </context>
 <context>
@@ -1891,7 +1891,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="42"/>
        <source>Open Local Folder</source>
-        <translation>Otevřít místní adresář</translation>
+        <translation>Otevřít místní složku</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="50"/>
@@ -1953,20 +1953,20 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Soubor se mezitím změnil</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2074,12 +2074,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
        <source>This folder must not be renamed. It is renamed back to its original name.</source>
-        <translation>Tento adresář nemůže být přejmenován. Byl mu vrácen původní název.</translation>
+        <translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
        <source>This folder must not be renamed. Please name it back to Shared.</source>
-        <translation>Tento adresář nemůže být přejmenován. Přejmenujte jej prosím zpět na Shared.</translation>
+        <translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
@@ -2100,48 +2100,48 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Soubor odebrán</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Místní soubor se během synchronizace změnil. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Místní soubor byl změněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Chybí adresa URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Místní soubor byl odstraněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -2171,7 +2171,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="56"/>
        <source>Folder</source>
-        <translation>Adresář</translation>
+        <translation>Složka</translation>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="57"/>
@@ -2184,17 +2184,17 @@ Nedoporučuje se jí používat.</translation>
        <translation>Velikost</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Místní protokol synchronizace</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopie</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopírovat záznam aktivity do schránky.</translation>
    </message>
@@ -2237,17 +2237,17 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/selectivesyncdialog.cpp" line="399"/>
        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
-        <translation>Neoznačené adresáře budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
+        <translation>Neoznačené složky budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
    </message>
    <message>
        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
        <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
-        <translation>Výběr synchronizace: Označte vzdálené podadresáře, které si přejete synchronizovat.</translation>
+        <translation>Výběr synchronizace: Označte vzdálené podsložky, které si přejete synchronizovat.</translation>
    </message>
    <message>
        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
        <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
-        <translation>Výběr synchronizace: Odznačte vzdálené podadresáře, které si nepřejete synchronizovat.</translation>
+        <translation>Výběr synchronizace: Odznačte vzdálené podsložky, které si nepřejete synchronizovat.</translation>
    </message>
    <message>
        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
@@ -2545,17 +2545,17 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - ověření</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Vyžadováno opětovné ověření</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Vaše sezení vypršelo. Chcete-li pokračovat v práci, musíte se znovu přihlásit.</translation>
    </message>
@@ -2563,7 +2563,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Sdílet s %1</translation>
@@ -2857,23 +2857,23 @@ Nedoporučuje se jí používat.</translation>
        <translation>Chyba při čtení adresáře.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvořit nadřazený adresář</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
    </message>
@@ -2893,7 +2893,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Zrušeno uživatelem</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Jméno souboru obsahuje neplatné znaky, které neumožňují synchronizaci mezi různými platformami.</translation>
    </message>
@@ -2933,109 +2933,109 @@ Nedoporučuje se jí používat.</translation>
        <translation>Došlo k interní chybě číslo %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Soubor se nachází na seznamu ignorovaných.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Jméno souboru je moc dlouhé.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat selhal.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Kódování znaků jména soubor je neplatné</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Neplatné znaky, prosím přejmenujte &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nemohu inicializovat synchronizační žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Nelze načíst blacklist z místní databáze</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Nelze číst ze žurnálu synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Nelze otevřít synchronizační žurnál</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorováno podle nastavení &quot;vybrat co synchronizovat&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranění není povoleno, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
-        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
+        <translation>Místní soubory a sdílená složka byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Přesun není povolen, položka obnovena</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>cílové umístění</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -3102,17 +3102,17 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="317"/>
        <source>Folder %1: %2</source>
-        <translation>Adresář %1: %2</translation>
+        <translation>Složka %1: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="322"/>
        <source>No sync folders configured.</source>
-        <translation>Nejsou nastaveny žádné synchronizované adresáře.</translation>
+        <translation>Nejsou nastaveny žádné synchronizované složky.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="332"/>
        <source>There are no sync folders configured.</source>
-        <translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation>
+        <translation>Nejsou nastaveny žádné složky pro synchronizaci.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="340"/>
@@ -3146,12 +3146,12 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="367"/>
        <source>Managed Folders:</source>
-        <translation>Spravované adresáře:</translation>
+        <translation>Spravované složky:</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="370"/>
        <source>Open folder &apos;%1&apos;</source>
-        <translation>Otevřít adresář &apos;%1&apos;</translation>
+        <translation>Otevřít složku &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="342"/>
@@ -3489,7 +3489,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/>
        <source>Your entire account is synced to the local folder </source>
-        <translation>Celý váš účet je synchronizován do místního adresáře</translation>
+        <translation>Celý váš účet je synchronizován do místní složky</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="98"/>
@@ -3568,33 +3568,33 @@ Nedoporučuje se jí používat.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation>%n rok(ů)</translation>
+        <source>%Ln year(s)</source>
+        <translation>%Ln rok(ů)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation>%n měsíc(ů)</translation>
+        <source>%Ln month(s)</source>
+        <translation>%Ln měsíc(ů)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation>%n dní</translation>
+        <source>%Ln day(s)</source>
+        <translation>%Ln dny(ů)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation>%n hodina(y)</translation>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln hodina(y)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation>%n minuta(y)</translation>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln minuta(y)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation>%n sekunda(y)</translation>
+        <source>%Ln second(s)</source>
+        <translation>%Ln sekunda(y)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -1000,12 +1000,12 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Ordner Synchronisation hinzufügen</translation>
    </message>
@@ -1023,7 +1023,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Pfad zum lokalen Verzeichnis eingeben</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Den Quellordner wählen</translation>
    </message>
@@ -1031,52 +1031,52 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Entfernten Ordner erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Geben Sie den Namen des neuen, unter &apos;%1&apos; zu erstellenden Ordners ein: </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Order erfolgreich auf %1 erstellt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Konnte Ordner nicht listen. Fehler: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Dieser Ordner wird bereits synchronisiert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird &lt;b&gt;nicht&lt;/b&gt; unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation.</translation>
    </message>
@@ -1084,7 +1084,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Zu synchronisierende Elemente auswählen: Sie können optional Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
    </message>
@@ -1954,17 +1954,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1  als Größe übermittelt hat.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Datei ist seit der Entdeckung geändert worden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2098,48 +2098,48 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT &lt; 5.4.2 wird erzwungen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -2182,17 +2182,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Größe</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Lokales Sychronisationsprotokoll</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
    </message>
@@ -2543,17 +2543,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Authentifikation</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Erneute Authentifizierung erforderlich</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Ihre Sitzung ist abgelaufen. Sie müssen sich zur weiteren Nutzung des Clients neu Anmelden.</translation>
    </message>
@@ -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="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
    </message>
@@ -2891,7 +2891,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Dateiname enthält Zeichen die nicht auf allen Betriebssystemen dargestellt werden können.</translation>
    </message>
@@ -2931,109 +2931,109 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Ein interner Fehler mit der Fehlernummer %1  ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Die Datei ist in der Ignorierliste geführt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Der Dateiname ist zu lang.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Dateikodierung ist ungültig</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Ungültige Zeichenm bitte benennen Sie &quot;%1&quot; um</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3566,33 +3566,33 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation>%n Jahr(e)</translation>
+        <source>%Ln year(s)</source>
+        <translation>%Ln Jahr(e)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation>%n Monat(e)</translation>
+        <source>%Ln month(s)</source>
+        <translation>%Ln Monat(e)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation>%n Tag(e)</translation>
+        <source>%Ln day(s)</source>
+        <translation>%Ln Tag(e)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation>%n Stunde(n)</translation>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln Stunde(n)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation>%n Minute(n)</translation>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln Minute(n)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation>%n Sekunde(n)</translation>
+        <source>%Ln second(s)</source>
+        <translation>%Ln Sekunde(n)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -999,12 +999,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation>
    </message>
@@ -1022,7 +1022,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Εισάγετε τη διαδρομή προς τον τοπικό φάκελο.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Επιλογή του φακέλου προέλευσης</translation>
    </message>
@@ -1030,52 +1030,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Εισάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου &lt;b&gt;δεν&lt;/b&gt; υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation>
    </message>
@@ -1083,7 +1083,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
    </message>
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2182,17 +2182,17 @@ It is not advisable to use it.</source>
        <translation>Μέγεθος</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
    </message>
@@ -2543,17 +2543,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Πιστοποίηση</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Απαιτείται επανάληψη πιστοποίησης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation>
    </message>
@@ -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="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
    </message>
@@ -2891,7 +2891,7 @@ It is not advisable to use it.</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
    </message>
@@ -2931,109 +2931,109 @@ It is not advisable to use it.</source>
        <translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3566,33 +3566,33 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln έτος(η)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln μήνας(ες)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln ημέρα(ες)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln ώρα(ες)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln λεπτό(ά)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln δευτερόλεπτο(α)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -1028,12 +1028,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1051,7 +1051,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1059,52 +1059,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1112,7 +1112,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1975,17 +1975,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2119,48 +2119,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2203,17 +2203,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2564,17 +2564,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2582,7 +2582,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation type="unfinished"></translation>
@@ -2874,23 +2874,23 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2910,7 +2910,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2950,109 +2950,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3594,32 +3594,32 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
+        <source>%Ln year(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
+        <source>%Ln month(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
+        <source>%Ln day(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
+        <source>%Ln hour(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
+        <source>%Ln minute(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
+        <source>%Ln second(s)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -218,7 +218,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="552"/>
        <source>Log in</source>
-        <translation>Iniciar sesión</translation>
+        <translation>Ingresar</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="636"/>
@@ -440,17 +440,17 @@
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="351"/>
        <source>You received %n new notification(s) from %2.</source>
-        <translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificacióne(s) de %2.</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="359"/>
        <source>You received %n new notification(s) from %1 and %2.</source>
-        <translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificacióne(s) de %1 y de %2.</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="361"/>
        <source>You received new notifications from %1, %2 and other accounts.</source>
-        <translation>Ha recibido nuevas notificaciónes de %1, %2 y otras cuentas.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="365"/>
@@ -1001,12 +1001,12 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Añadir Conexión para el Directorio de Sincronización</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Añadir Sincronización de Conexión</translation>
    </message>
@@ -1024,7 +1024,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
        <translation>Ingrese la ruta de la carpeta local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Seleccione la carpeta de origen</translation>
    </message>
@@ -1032,52 +1032,52 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Introduzca más abajo el nombre de la nueva carpeta que crear &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>La carpeta fue creada con éxito en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Falló la autenticación al acceder a %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Falló al listar una carpeta. Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Elija esto para sincronizar la cuenta entera</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Este directorio ya se ha sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ya ha sincronizado &lt;i&gt;%1&lt;/i&gt;, el cual es la carpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Todavía se están sincronizando ficheros. &lt;b&gt;No&lt;/b&gt; se admite la sincronización de otras carpetas. Si quiere sincronizar múltiples carpetas, por favor revise la carpeta raíz configurada.</translation>
    </message>
@@ -1085,7 +1085,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Elija qué sinconizar: Opcionalmente puede deseleccionar subcarpetas remotas que no desee sincronizar</translation>
    </message>
@@ -1684,7 +1684,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
        <source>&amp;Email</source>
-        <translation>&amp;Email</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
@@ -1952,20 +1952,20 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>El archivo ha cambiado desde que fue descubierto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -2099,48 +2099,48 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Archivo eliminado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Un archivo local fue modificado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt&lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Falta la URL de la encuesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>El archivo local ha sido eliminado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -2183,17 +2183,17 @@ No se recomienda usarla.</translation>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Protocolo de sincronización local</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copie la lista de actividades al portapapeles</translation>
    </message>
@@ -2384,7 +2384,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="113"/>
        <source>Retrieving maximum possible sharing permissions from server...</source>
-        <translation>Descargando el maximo número de permisos compartidos del servidor...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2544,17 +2544,17 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticar</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Debe volver a autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Su sesión ha caducado. Necesita volver a iniciarla para continuar usando el cliente.</translation>
    </message>
@@ -2562,7 +2562,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <source>Share with %1</source>
        <comment>parameter is ownCloud</comment>
        <translation>Compartir con %1</translation>
@@ -2856,23 +2856,23 @@ No se recomienda usarla.</translation>
        <translation>Error al leer el directorio.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>No permitido porque no tienes permiso para añadir un directorio padre</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>No permitido porque no tienes permiso para añadir archivos a ese directorio</translation>
    </message>
@@ -2892,7 +2892,7 @@ No se recomienda usarla.</translation>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>El nombre del archivo contiene caracteres inválidos que no pueden ser sincronizados entre las plataformas.</translation>
    </message>
@@ -2932,109 +2932,109 @@ No se recomienda usarla.</translation>
        <translation>Ocurrió un error interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>El elemento no está sincronizado por errores previos: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>No se admiten enlaces simbólicos en la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fichero está en la lista de ignorados</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>El nombre del archivo es demasiado largo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat ha fallado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Los caracteres del nombre de fichero no son válidos</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Caracteres inválidos, por favor renombre &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation>No se ha podido leer desde el registro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>No es posible abrir el diario de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Nombre de archivo contiene al menos un caracter no válido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado porque se encuentra en la lista negra de &quot;elija qué va a sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>No permitido porque no tienes permiso para añadir subdirectorios a ese directorio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No está permitido borrar, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Se han eliminado los archivos locales y la carpeta compartida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>No está permitido mover, elemento restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -3567,33 +3567,33 @@ No se recomienda usarla.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation>%n año(s)</translation>
+        <source>%Ln year(s)</source>
+        <translation>%Ln año(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation>%n Mese(s)</translation>
+        <source>%Ln month(s)</source>
+        <translation>%Ln meses(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation>%n dia(s)</translation>
+        <source>%Ln day(s)</source>
+        <translation>%Ln dia(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation>%n hora(s)</translation>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln hora(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation>%n minuto(s)</translation>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln minuto(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation>%n segundo(s)</translation>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundos(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -996,12 +996,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Ingrese el path al directorio local.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Seleccioná el directorio origen</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Crear carpeta remota</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>El directorio fue creado con éxito en %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Seleccioná acá para sincronizar la cuenta completa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Este folder ya está siendo sincronizado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es el directorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>Tamaño</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Copiar la lista de actividades al portapapeles.</translation>
    </message>
@@ -2532,17 +2532,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Autenticarse</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -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="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>El archivo está en la lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Imposible inicializar un diario de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3554,33 +3554,33 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
+        <source>%Ln year(s)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
+        <source>%Ln month(s)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
+        <source>%Ln day(s)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
+        <source>%Ln hour(s)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
+        <source>%Ln minute(s)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundo(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -996,12 +996,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sisesta otsingutee kohaliku kataloogini.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Vali algne kaust</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Loo kaugkaust</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1 - kaust on loodud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Vali see sünkroniseering tervele kontole</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Seda kataloogi juba sünkroniseeritakse.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Sa juba sünkroniseerid &lt;i&gt;%1&lt;/i&gt;, mis on &lt;i&gt;%2&lt;/i&gt; ülemkataloog.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering &lt;b&gt;ei ole&lt;/b&gt; toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog.</translation>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1944,17 +1944,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Faili on pärast avastamist muudetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2088,48 +2088,48 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation>Küsitluse URL puudub</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2172,17 +2172,17 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Suurus</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
    </message>
@@ -2533,17 +2533,17 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Vajalik on uuesti autentimine</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Sinu sessioon on aegunud. Sa pead kliendi kasutamiseks uuesti sisse logima.</translation>
    </message>
@@ -2551,7 +2551,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2881,7 +2881,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2921,109 +2921,109 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fail on märgitud ignoreeritavate nimistus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Faili nimi on liiga pikk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Failinime kodeering pole kehtiv</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Faili nimesonvähemalt üks keelatud märk</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Vali, mida sünkroniseerida&quot; musta nimekirja tõttu vahele jäetud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3556,33 +3556,33 @@ Selle kasutamine pole soovitatav.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln aasta(t)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln kuu(d)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln päeva(a)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln tund(i)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln minut(it)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln sekund(it)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -996,12 +996,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Gehitu Karpeta Sinkronizatzeko Konexioa</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Gehitu Sinkronizazio Konexioa</translation>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Sartu bertako karpeta berriaren bidea:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Hautatu jatorrizko karpeta</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Sortu Urruneko Karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation>Sartu behean sortuko den karpeta berriaren izena &apos;%1&apos;:</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>%1-en karpeta ongi sortu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation>Autentikazioak huts egin du %1en sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Karpetaren zerrenda lortzeak huts egin du: Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Hautatu hau kontu osoa sinkronizatzeko</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Dagoeneko  &lt;i&gt;%1&lt;/i&gt; sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren guraso karpeta dena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation>Dagoeneko fitxategi guztiak sinkronizatzen ari zara. &lt;b&gt;Ezin&lt;b&gt; da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia.</translation>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Hautatu zer nahi duzun sinkronizatzea: Sinkronizatu nahi ez dituzun urruneko azpikarpetak desmarkatu ditzazkezu.</translation>
    </message>
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2094,48 +2094,48 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Fitxategia Ezabatua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2178,17 +2178,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Tamaina</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Bertako sinkronizazio protokolo</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopiatu jarduera zerrenda arbelara.</translation>
    </message>
@@ -2539,17 +2539,17 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Berautentikatzea beharrezkoa</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -2557,7 +2557,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SocketApi</name>
    <message>
-        <location filename="../src/gui/socketapi.cpp" line="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2885,7 +2885,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2925,109 +2925,109 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation>Ezin da sinkronizazio egunerokoa ireki</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3560,33 +3560,33 @@ Ez da gomendagarria erabltzea.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln urte</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln hilabete</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln egun</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln ordu</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln minutu</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln segundu</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -996,12 +996,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation type="unfinished"/>
    </message>
@@ -1019,7 +1019,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>پوشه ی اصلی را انتخاب کنید</translation>
    </message>
@@ -1027,52 +1027,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation>پوشه با موفقیت ایجاد شده است  %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>این پوشه همگام‌سازی شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1080,7 +1080,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation type="unfinished"/>
    </message>
@@ -1943,17 +1943,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>فایل حذف شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>فایل محلی در حین همگام‌سازی حذف شده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2171,17 +2171,17 @@ It is not advisable to use it.</source>
        <translation>اندازه</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>کپی کردن</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
@@ -2532,17 +2532,17 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation type="unfinished"/>
    </message>
@@ -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="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2878,7 +2878,7 @@ It is not advisable to use it.</source>
        <translation>متوقف شده توسط کاربر</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
@@ -2918,109 +2918,109 @@ It is not advisable to use it.</source>
        <translation>یک خطای داخلی با شماره خطای  %1  رخ داده است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>نام فایل خیلی طولانی است.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>وضعیت ناموفق</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>رمزگذاری نام فایل معتبر نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>کاراکتر نامعتبر، لطفا &quot;%1&quot; را تغییر نام دهید</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>با توجه به عدم اجازه‌ی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>حذف مجاز نیست، در حال بازگردادن</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>فایل‌های محلی و پوشه‌ی اشتراک حذف شد.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3553,33 +3553,33 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln سال(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln ماه(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln روز(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln ساعت(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln دقیقه (s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln ثانیه(s)</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
@@ -997,12 +997,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizard</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="542"/>
+        <location filename="../src/gui/folderwizard.cpp" line="553"/>
        <source>Add Folder Sync Connection</source>
        <translation>Lisää kansion synkronointiyhteys</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="544"/>
+        <location filename="../src/gui/folderwizard.cpp" line="555"/>
        <source>Add Sync Connection</source>
        <translation>Lisää synkronointiyhteys</translation>
    </message>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Anna paikallisen kansion polku</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="126"/>
+        <location filename="../src/gui/folderwizard.cpp" line="133"/>
        <source>Select the source folder</source>
        <translation>Valitse lähdekansio</translation>
    </message>
@@ -1028,52 +1028,52 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardRemotePath</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="176"/>
+        <location filename="../src/gui/folderwizard.cpp" line="191"/>
        <source>Create Remote Folder</source>
        <translation>Luo etäkansio</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="177"/>
+        <location filename="../src/gui/folderwizard.cpp" line="192"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="206"/>
+        <location filename="../src/gui/folderwizard.cpp" line="221"/>
        <source>Folder was successfully created on %1.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="217"/>
+        <location filename="../src/gui/folderwizard.cpp" line="232"/>
        <source>Authentication failed accessing %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="219"/>
+        <location filename="../src/gui/folderwizard.cpp" line="234"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="226"/>
+        <location filename="../src/gui/folderwizard.cpp" line="241"/>
        <source>Failed to list a folder. Error: %1</source>
        <translation>Kansion listaaminen epäonnistui. Virhe: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="307"/>
+        <location filename="../src/gui/folderwizard.cpp" line="322"/>
        <source>Choose this to sync the entire account</source>
        <translation>Valitse tämä synkronoidaksesi koko tilin</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="436"/>
+        <location filename="../src/gui/folderwizard.cpp" line="451"/>
        <source>This folder is already being synced.</source>
        <translation>Tätä kansiota synkronoidaan jo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="438"/>
+        <location filename="../src/gui/folderwizard.cpp" line="453"/>
        <source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
        <translation>Synkronoit jo kansiota &lt;i&gt;%1&lt;/i&gt;, ja se on kansion &lt;i&gt;%2&lt;/i&gt; yläkansio.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="442"/>
+        <location filename="../src/gui/folderwizard.cpp" line="457"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
        <translation type="unfinished"/>
    </message>
@@ -1081,7 +1081,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
 <context>
    <name>OCC::FolderWizardSelectiveSync</name>
    <message>
-        <location filename="../src/gui/folderwizard.cpp" line="480"/>
+        <location filename="../src/gui/folderwizard.cpp" line="495"/>
        <source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
        <translation>Päätä mitä synkronoidaan: voit valinnaisesti jättää valitsematta etäkansioita, joita et halua synkronoitavan.</translation>
    </message>
@@ -1951,17 +1951,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2095,48 +2095,48 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="291"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="289"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="303"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="301"/>
        <source>Local file changed during syncing. It will be resumed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="315"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="313"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="694"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="621"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="629"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="660"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="683"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="709"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="792"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="782"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -2179,17 +2179,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Koko</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="72"/>
        <source>Local sync protocol</source>
        <translation>Paikallinen synkronointiprotokolla</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="74"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/protocolwidget.cpp" line="81"/>
+        <location filename="../src/gui/protocolwidget.cpp" line="75"/>
        <source>Copy the activity list to the clipboard.</source>
        <translation>Kopioi toimilista leikepöydälle.</translation>
    </message>
@@ -2540,17 +2540,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::ShibbolethWebView</name>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="79"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="74"/>
        <source>%1 - Authenticate</source>
        <translation>%1 - Tunnistaudu</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Reauthentication required</source>
        <translation>Tunnistaudu uudelleen</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="85"/>
+        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="80"/>
        <source>Your session has expired. You need to re-login to continue to use the client.</source>
        <translation>Istunto on vanhentunut. Kirjaudu uudelleen jatkaaksesi sovelluksen käyttämistä.</translation>
    </message>
@@ -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="453"/>
+        <location filename="../src/gui/socketapi.cpp" line="441"/>
        <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="440"/>
+        <location filename="../src/libsync/syncengine.cpp" line="431"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="701"/>
+        <location filename="../src/libsync/syncengine.cpp" line="690"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
        <translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1121"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1128"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
    </message>
@@ -2888,7 +2888,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="434"/>
+        <location filename="../src/libsync/syncengine.cpp" line="425"/>
        <source>Filename contains invalid characters that can not be synced cross platform.</source>
        <translation>Tiedoston nimi sisältää virheellisiä merkkejä, joita ei voi synkronoida alustariippumattomasti.</translation>
    </message>
@@ -2928,109 +2928,109 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>Sisäinen virhe, numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="263"/>
+        <location filename="../src/libsync/syncengine.cpp" line="254"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="428"/>
+        <location filename="../src/libsync/syncengine.cpp" line="419"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="431"/>
+        <location filename="../src/libsync/syncengine.cpp" line="422"/>
        <source>File is listed on the ignore list.</source>
        <translation>Tiedosto on ohituslistalla.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="437"/>
+        <location filename="../src/libsync/syncengine.cpp" line="428"/>
        <source>Filename is too long.</source>
        <translation>Tiedoston nimi on liian pitkä.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="446"/>
+        <location filename="../src/libsync/syncengine.cpp" line="437"/>
        <source>Stat failed.</source>
        <translation>Stat epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="473"/>
+        <location filename="../src/libsync/syncengine.cpp" line="464"/>
        <source>Filename encoding is not valid</source>
        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="644"/>
+        <location filename="../src/libsync/syncengine.cpp" line="635"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
        <translation>Virheellisiä merkkejä, anna uusi nimi kohteelle &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="735"/>
+        <location filename="../src/libsync/syncengine.cpp" line="724"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="754"/>
+        <location filename="../src/libsync/syncengine.cpp" line="743"/>
        <source>Unable to read the blacklist from the local database</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="776"/>
        <source>Unable to read from the sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="822"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="876"/>
        <source>File name contains at least one invalid character</source>
        <translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1080"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1087"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1106"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1148"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1185"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1198"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1253"/>
        <source>Move not allowed, item restored</source>
        <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1262"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Siirto ei ole sallittu, koska %1 on &quot;vain luku&quot;-tilassa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1263"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3563,33 +3563,33 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="314"/>
-        <source>%n year(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln year(s)</source>
+        <translation>%Ln v</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="315"/>
-        <source>%n month(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln month(s)</source>
+        <translation>%Ln kk</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="316"/>
-        <source>%n day(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln day(s)</source>
+        <translation>%Ln pv</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="317"/>
-        <source>%n hour(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln hour(s)</source>
+        <translation>%Ln t</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="318"/>
-        <source>%n minute(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln minute(s)</source>
+        <translation>%Ln min</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="319"/>
-        <source>%n second(s)</source>
-        <translation type="unfinished"/>
+        <source>%Ln second(s)</source>
+        <translation>%Ln s</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="343"/>
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Klaas Freitag	098b603879	TrayNotification: Add Alert classes for error, warning etc. For that, the logger needs to pass through the notification type that it wants to display. The snore notifications show specific icons for each type.	2016-05-06 17:26:40 +02:00
Klaas Freitag	7c3b3d648b	Systray: Broadcast notifications using libsnore if available.	2016-05-06 14:50:09 +02:00
Klaas Freitag	778aca386c	CMake: Find and use libsnore for cross platform notifications.	2016-05-06 14:50:09 +02:00
Klaas Freitag	0758b2cf61	Application: Renamed to oCApplication to avoid clashes with other projeccts that define a class Application as well, such as the snorenotify lib.	2016-05-06 14:50:09 +02:00