VERSION.cmake: 2.2.4 final

2.2.4: Set release date
Improvements to file recall
2016-09-27 10:53:37 +02:00 · 2016-09-27 10:52:18 +02:00 · 2016-09-14 15:42:19 +02:00 · 2016-09-27 02:18:32 +02:00 · 2016-09-26 02:18:30 +02:00 · 2016-09-25 02:18:36 +02:00
@@ -1,7 +1,17 @@
 ChangeLog
 =========

-version 2.2.3 (release 2016-07-xx)
+version 2.2.4 (release 2016-09-27)
+* Dolphin Plugin: Use the Application name for the socket path (#5172)
+* SyncEngine: Fix renaming of folder when file are changed (#5195)
+* Selective Sync: Fix HTTP request loop and show error in view (#5154)
+* ConnectionValidator: properly handle error in status.php request (#5188)
+* Discovery: Set thread priority to low (#5017)
+* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
+* ShareLink: Ensure the password line edit is enabled (#5117)
+
+version 2.2.3 (release 2016-08-08)
+* SyncEngine: Fix detection of backup (#5104)
 * Fix bug with overriding URL in config (#5016)
 * Sharing: Fix bug with file names containing percent encodes (#5042, #5043)
 * Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001)
@@ -16,7 +26,6 @@ version 2.2.3 (release 2016-07-xx)
 * Fix small QAction memleak (#5008)
 * Fix crash on shutting down during propagation (#4979)
 * Decrease memory usage during sync #4979
-* Fix a deadlock when shutting down during discovery (#4993)
 * Setup csync logging earlier to get all log output (#4991)
 * Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env

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

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -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¡)"
@@ -1,14 +1,14 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine por si?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos de ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado nenhum processo para terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Está instalada no sistema uma versão antiga de ${APPLICATION_NAME}. É recomendado que desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
+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 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}"
@@ -20,17 +20,17 @@ StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Wi
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos da área de trabalho"
 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 "Neodin
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova� ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova� staršiu verziu. Ak naozaj chcete nainštalova� túto staršiu verziu, je lepšie najprv odinštalova� aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.$\n$\nVyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_SAME_Field_2 "Prida�/Preinštalova� komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinštalova� ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova� ${APPLICATION_NAME}"
@@ -38,6 +37,7 @@ StrCpy $UAC_ERROR_ELEVATE "Nemo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento inštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_INSTALLER_RUNNING "Inštalátor je už spustený."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Prihlasovacia služba nebeží! Prerušuje sa."
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -2,7 +2,7 @@
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para finalizar no encontrado!"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
@@ -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."
@@ -1,5 +1,5 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกที่มี"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกประจำรุ่น"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน$\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
@@ -2,27 +2,27 @@
 !insertmacro MUI_LANGUAGE "Swedish"
 !insertmacro MUI_LANGUAGE "Estonian"
 !insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Slovenian"
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Russian"
 !insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
 !insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Czech"
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
@@ -0,0 +1,7 @@
+[Paths]
+Prefix = .
+Plugins = .
+Binaries = .
+Imports = .
+Qml2Imports = .
+LibraryExecutables = .
@@ -411,6 +411,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "@CPACK_RESOURCE_FILE_LICENSE@"
   ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt

+   ;Qt config:
+   File "${NSI_PATH}\qt.conf"
+
   ;Qt stuff:
   File "${QT_DLL_PATH}\Qt5Core.dll"
   File "${QT_DLL_PATH}\Qt5Gui.dll"
@@ -98,7 +98,6 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
-    CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME,
    CYSNC_STATUS_FILE_LOCKED_OR_OPEN,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN,
@@ -243,14 +243,9 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    // distinguish files ending in '.' from files without an ending,
    // as '.' is a separator that is not stored internally, so let's
    // not allow to sync those to avoid file loss/ambiguities (#416)
-    if (blen > 1) {
-        if (bname[blen-1]== ' ') {
-            match = CSYNC_FILE_EXCLUDE_TRAILING_SPACE;
-            goto out;
-        } else if (bname[blen-1]== '.' ) {
-            match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-            goto out;
-        }
+    if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
+        match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+        goto out;
    }

    if (csync_is_windows_reserved_word(bname)) {
@@ -27,7 +27,6 @@ enum csync_exclude_type_e {
  CSYNC_FILE_EXCLUDE_AND_REMOVE,
  CSYNC_FILE_EXCLUDE_LIST,
  CSYNC_FILE_EXCLUDE_INVALID_CHAR,
-  CSYNC_FILE_EXCLUDE_TRAILING_SPACE,
  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
  CSYNC_FILE_EXCLUDE_HIDDEN,
  CSYNC_FILE_EXCLUDE_STAT_FAILED
@@ -477,8 +477,6 @@ out:
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST; /* File listed on ignore list. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_INVALID_CHAR) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS;  /* File contains invalid characters. */
-          } else if (excluded == CSYNC_FILE_EXCLUDE_TRAILING_SPACE) {
-              st->error_status = CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE; /* File ends with a trailing space. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_LONG_FILENAME) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME; /* File name is too long. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_HIDDEN ) {
@@ -30,6 +30,7 @@

 static void setup(void **state) {
    CSYNC *csync;
+    int rc;

    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

@@ -178,20 +179,6 @@ static void check_csync_excluded(void **state)

    rc = csync_excluded_no_ctx(csync->excludes, "latex/songbook/my_manuscript.tex.tmp", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-#ifdef _WIN32
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_space ", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_TRAILING_SPACE);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_dot.", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "AUX", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_invalid_char<", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-#endif
 }

 static void check_csync_excluded_traversal(void **state)
@@ -318,14 +305,13 @@ static void check_csync_excluded_performance(void **state)

    const int N = 10000;
    int totalRc = 0;
-    int i = 0;

    // Being able to use QElapsedTimer for measurement would be nice...
    {
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_no_ctx(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_no_ctx(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -343,7 +329,7 @@ static void check_csync_excluded_performance(void **state)
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_traversal(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_traversal(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -74,6 +74,7 @@ static void teardown(void **state) {
 static void check_csync_init(void **state)
 {
    CSYNC *csync = *state;
+    int rc;

    csync_init(csync);

@@ -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($)
@@ -56,6 +56,8 @@ assertLocalAndRemoteDir( '', 0);
 printInfo( "Testing with a .sys.admin#recall#" );
 system("echo 'dir/file2.dat' > ". $tmpdir . ".sys.admin\#recall\#");
 system("echo 'dir/file3.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
+system("echo 'nonexistant' >> ". $tmpdir . ".sys.admin\#recall\#");
+system("echo '/tmp/t_recall/file4.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
 glob_put( "$tmpdir/.sys.admin\#recall\#", "" );

 csync();
@@ -64,6 +66,14 @@ csync();
 assert( -e glob(localDir().'dir/file2_.sys.admin#recall#-*.dat' ) );
 assert( -e glob(localDir().'dir/file3_.sys.admin#recall#-*.dat' ) );

+# verify that the original files still exist
+assert( -e glob(localDir().'dir/file2.dat' ) );
+assert( -e glob(localDir().'dir/file3.dat' ) );
+
+assert( !-e glob(localDir().'nonexistant*' ) );
+assert( !-e glob('/tmp/t_recall/file4_.sys.admin#recall#-*.dat' ) );
+assert( -e glob('/tmp/t_recall/file4.dat' ) );
+
 #Remove the recall file
 unlink(localDir() . ".sys.admin#recall#");

@@ -7,7 +7,7 @@ On Microsoft Windows systems:
        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``

 On MAC OS X systems:
-        ``$HOME/Library/Application Support/ownCloud/owncloud.cfg``
+        ``$HOME/Library/Application Support/ownCloud``


 The configuration file contains settings using the Microsoft Windows .ini file
@@ -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:

@@ -205,6 +205,153 @@ X-GNOME-Autostart-Delay=3
 # Translations


+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -227,9 +374,11 @@ GenericName[de]=Ordner-Synchronisation
 Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 Icon[de]=@APPLICATION_EXECUTABLE@
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダ同期
+GenericName[ja_JP]=フォルダー同期
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+GenericName[el]=Συγχρονισμός φακέλου
+Icon[el]=@APPLICATION_EXECUTABLE@
 Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
 GenericName[en_GB]=Folder Sync
 Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
@@ -242,10 +391,10 @@ Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 GenericName[de_DE]=Ordner-Synchronisation
 Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 Icon[de_DE]=@APPLICATION_EXECUTABLE@
-Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
-GenericName[bg_BG]=Синхронизиране на папката
-Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
-Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+GenericName[pl]=Folder Synchronizacji
+Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
+Icon[pl]=@APPLICATION_EXECUTABLE@
 Comment[fr]=@APPLICATION_NAME@ synchronisation du client
 GenericName[fr]=Dossier de Synchronisation
 Name[fr]=@APPLICATION_NAME@ synchronisation du client
@@ -281,10 +430,10 @@ Comment[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
 GenericName[et_EE]=Kaustade sünkroonimine
 Name[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
 Icon[et_EE]=@APPLICATION_EXECUTABLE@
-Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
-GenericName[pl]=Folder Synchronizacji
-Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
-Icon[pl]=@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
@@ -305,13 +454,17 @@ 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[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
+GenericName[fi_FI]=Kansion synkronointi
+Name[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
+Icon[fi_FI]=@APPLICATION_EXECUTABLE@
 Comment[sv]=@APPLICATION_NAME@ desktop synkroniseringsklient
 GenericName[sv]=Mappsynk
 Name[sv]=@APPLICATION_NAME@ desktop synk-klient
 Icon[sv]=@APPLICATION_EXECUTABLE@
-Comment[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
-GenericName[tr]=Dosya Senkronizasyonu
-Name[tr]=@APPLICATION_NAME@ masaüstü senkronizasyon istemcisi
+Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
+GenericName[tr]=Dosya Eşitleme
+Name[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
 Icon[tr]=@APPLICATION_EXECUTABLE@
 Comment[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
 GenericName[uk]=Синхронізація теки
@@ -21,6 +21,7 @@
 #include <qcoreevent.h>
 #include <QFile>
 #include "ownclouddolphinpluginhelper.h"
+#include "config.h"

 OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
 {
@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect()
        return;
    }
    QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
-    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
+    runtimeDir.append( QChar('/'));
+    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
+
+    const QString socketPath = runtimeDir + QLatin1String("/socket");
    _socket.connectToServer(socketPath);
 }

@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QFile>
-#include <QFileInfo>
 #include <qdebug.h>

 #include "account.h"
@@ -197,12 +196,10 @@ void parseOptions( const QStringList& app_args, CmdOptions *options )
    if (!options->source_dir.endsWith('/')) {
        options->source_dir.append('/');
    }
-    QFileInfo fi(options->source_dir);
-    if( !fi.exists() ) {
+    if( !QFile::exists( options->source_dir )) {
        std::cerr << "Source dir '" << qPrintable(options->source_dir) << "' does not exist." << std::endl;
        exit(1);
    }
-    options->source_dir = fi.absoluteFilePath();

    QStringListIterator it(args);
    // skip file name;
@@ -275,6 +272,12 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
 int main(int argc, char **argv) {
    QCoreApplication app(argc, argv);

+#ifdef Q_OS_WIN
+    // Ensure OpenSSL config file is only loaded from app directory
+    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
+    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
+#endif
+
    qsrand(QTime::currentTime().msec() * QCoreApplication::applicationPid());

    CmdOptions options;
@@ -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;
@@ -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&);
@@ -105,6 +105,12 @@ Application::Application(int &argc, char **argv) :
 {
    _startedAt.start();

+#ifdef Q_OS_WIN
+    // Ensure OpenSSL config file is only loaded from app directory
+    QString opensslConf = QCoreApplication::applicationDirPath()+QString("/openssl.cnf");
+    qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
+#endif
+
 // TODO: Can't set this without breaking current config paths
 //    setOrganizationName(QLatin1String(APPLICATION_VENDOR));
    setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
@@ -354,11 +360,10 @@ void Application::setupLogging()

    Logger::instance()->enterNextLogFile();

-    qDebug() << QString::fromLatin1( "################## %1 %2 (%3) %4 on %5").arg(_theme->appName())
+    qDebug() << QString::fromLatin1( "################## %1 %2 (%3) %4").arg(_theme->appName())
                .arg( QLocale::system().name() )
                .arg(property("ui_lang").toString())
-                .arg(_theme->version())
-                .arg(Utility::platformName());
+                .arg(_theme->version());

    // Setup CSYNC logging to forward to our own logger
    csync_set_log_callback( csyncLogCatcher );
@@ -14,7 +14,6 @@
 */

 #include <QInputDialog>
-#include <QLabel>
 #include "creds/httpcredentialsgui.h"
 #include "theme.h"
 #include "account.h"
@@ -32,52 +31,26 @@ void HttpCredentialsGui::askFromUser()

 void HttpCredentialsGui::askFromUserAsync()
 {
-    QString msg = tr("Please enter %1 password:<br>"
-                     "<br>"
-                     "User: %2<br>"
-                     "Account: %3<br>")
-                  .arg(Utility::escape(Theme::instance()->appNameGUI()),
-                       Utility::escape(_user),
-                       Utility::escape(_account->displayName()));
-
-    QString reqTxt = requestAppPasswordText(_account);
-    if (!reqTxt.isEmpty()) {
-        msg += QLatin1String("<br>") + reqTxt + QLatin1String("<br>");
-    }
+    QString msg = tr("Please enter %1 password:\n"
+                     "\n"
+                     "User: %2\n"
+                     "Account: %3\n")
+                  .arg(Theme::instance()->appNameGUI(), _user, _account->displayName());
    if (!_fetchErrorString.isEmpty()) {
-        msg += QLatin1String("<br>") + tr("Reading from keychain failed with error: '%1'").arg(
-                    Utility::escape(_fetchErrorString)) + QLatin1String("<br>");
+        msg += QLatin1String("\n") + tr("Reading from keychain failed with error: '%1'").arg(
+                    _fetchErrorString) + QLatin1String("\n");
    }

-    QInputDialog dialog;
-    dialog.setWindowTitle(tr("Enter Password"));
-    dialog.setLabelText(msg);
-    dialog.setTextValue(_previousPassword);
-    dialog.setTextEchoMode(QLineEdit::Password);
-    if (QLabel *dialogLabel = dialog.findChild<QLabel *>()) {
-        dialogLabel->setOpenExternalLinks(true);
-        dialogLabel->setTextFormat(Qt::RichText);
-    }
-
-    bool ok = dialog.exec();
+    bool ok = false;
+    QString pwd = QInputDialog::getText(0, tr("Enter Password"), msg,
+                                 QLineEdit::Password, _previousPassword,
+                                 &ok);
    if (ok) {
-        _password = dialog.textValue();
+        _password = pwd;
        _ready = true;
        persist();
    }
    emit asked();
 }

-QString HttpCredentialsGui::requestAppPasswordText(const Account* account)
-{
-    if (account->serverVersionInt() < 0x090100) {
-        // Older server than 9.1 does not have trhe feature to request App Password
-        return QString();
-    }
-
-    return tr("<a href=\"%1\">Click here</a> to request an app password from the web interface.")
-        .arg(account->url().toString() + QLatin1String("/index.php/settings/personal?section=apppasswords"));
-}
-
-
 } // namespace OCC
@@ -30,8 +30,6 @@ public:
    HttpCredentialsGui(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd) : HttpCredentials(user, password, certificatePath, certificatePasswd) {}
    void askFromUser() Q_DECL_OVERRIDE;
    Q_INVOKABLE void askFromUserAsync();
-
-    static QString requestAppPasswordText(const Account *account);
 };

 } // namespace OCC
@@ -62,7 +62,6 @@ Folder::Folder(const FolderDefinition& definition,
      , _consecutiveFailingSyncs(0)
      , _consecutiveFollowUpSyncs(0)
      , _journal(definition.localPath)
-      , _fileLog(new SyncRunFileLog)
 {
    qRegisterMetaType<SyncFileItemVector>("SyncFileItemVector");
    qRegisterMetaType<SyncFileItem::Direction>("SyncFileItem::Direction");
@@ -110,8 +109,6 @@ Folder::Folder(const FolderDefinition& definition,
            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_engine.data(), SIGNAL(newBigFolder(QString)), this, SLOT(slotNewBigFolderDiscovered(QString)));
    connect(_engine.data(), SIGNAL(seenLockedFile(QString)), FolderMan::instance(), SLOT(slotSyncOnceFileUnlocks(QString)));
-    connect(_engine.data(), SIGNAL(aboutToPropagate(SyncFileItemVector&)),
-            SLOT(slotLogPropagationStart()));
 }

 Folder::~Folder()
@@ -367,11 +364,18 @@ void Folder::bubbleUpSyncResult()
    SyncFileItemPtr firstConflictItem;
    SyncFileItemPtr firstItemError;

+    SyncRunFileLog syncFileLog;
+
+    syncFileLog.start(path(), _engine->isSyncRunning() ? _engine->stopWatch() : Utility::StopWatch() );
+
    QElapsedTimer timer;
    timer.start();

    foreach (const SyncFileItemPtr &item, _syncResult.syncFileItemVector() ) {
-        // Process the item to the gui
+        // Log the item
+        syncFileLog.logItem( *item );
+
+        // and process the item to the gui
        if( item->_status == SyncFileItem::FatalError || item->_status == SyncFileItem::NormalError ) {
            //: this displays an error string (%2) for a file %1
            slotSyncError( tr("%1: %2").arg(item->_file, item->_errorString) );
@@ -436,6 +440,7 @@ void Folder::bubbleUpSyncResult()
            }
        }
    }
+    syncFileLog.close();

    qDebug() << "Processing result list and logging took " << timer.elapsed() << " Milliseconds.";
    _syncResult.setWarnCount(ignoredItems);
@@ -753,8 +758,6 @@ void Folder::startSync(const QStringList &pathList)

    _engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);

-    _fileLog->start(path());
-
    QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);

    // disable events until syncing is done
@@ -818,7 +821,6 @@ void Folder::slotSyncFinished(bool success)
    } else {
        qDebug() << "-> SyncEngine finished without problem.";
    }
-    _fileLog->finish();
    bubbleUpSyncResult();

    bool anotherSyncNeeded = _engine->isAnotherSyncNeeded();
@@ -925,7 +927,6 @@ void Folder::slotItemCompleted(const SyncFileItem &item, const PropagatorJob& jo
        // Count all error conditions.
        _syncResult.setWarnCount(_syncResult.warnCount()+1);
    }
-    _fileLog->logItem(item);
    emit ProgressDispatcher::instance()->itemCompleted(alias(), item, job);
 }

@@ -963,11 +964,6 @@ void Folder::slotNewBigFolderDiscovered(const QString &newF)
    }
 }

-void Folder::slotLogPropagationStart()
-{
-    _fileLog->logLap("Propagation starts");
-}
-


 void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
@@ -1002,7 +998,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. "
@@ -35,7 +35,6 @@ namespace OCC {

 class SyncEngine;
 class AccountState;
-class SyncRunFileLog;

 /**
 * @brief The FolderDefinition class
@@ -264,8 +263,6 @@ private slots:

    void slotNewBigFolderDiscovered(const QString &);

-    void slotLogPropagationStart();
-
 private:
    bool setIgnoredFiles();

@@ -314,8 +311,6 @@ private:
    SyncJournalDb _journal;

    ClientProxy   _clientProxy;
-
-    QScopedPointer<SyncRunFileLog> _fileLog;
 };

 }
@@ -164,7 +164,8 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
        switch(role) {
            case Qt::DisplayRole:
                if (x->_hasError) {
-                    return tr("Error while loading the list of folders from the server.");
+                    return QVariant(tr("Error while loading the list of folders from the server.")
+                                               + QString("\n") + x->_lastErrorString);
                } else {
                    return tr("Fetching folder list from server...");
                }
@@ -498,6 +499,10 @@ bool FolderStatusModel::canFetchMore(const QModelIndex& parent) const
    auto info = infoForIndex(parent);
    if (!info || info->_fetched || info->_fetching)
        return false;
+    if (info->_hasError) {
+        // Keep showing the error to the user, it will be hidden when the account reconnects
+        return false;
+    }
    return true;
 }

@@ -548,6 +553,7 @@ void FolderStatusModel::slotUpdateDirectories(const QStringList &list)

    if (parentInfo->hasLabel()) {
        beginRemoveRows(idx, 0 ,0);
+        parentInfo->_lastErrorString.clear();
        parentInfo->_hasError = false;
        parentInfo->_fetchingLabel = false;
        endRemoveRows();
@@ -584,7 +590,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;

@@ -675,6 +681,9 @@ void FolderStatusModel::slotLscolFinishedWithError(QNetworkReply* r)
    }
    auto parentInfo = infoForIndex(idx);
    if (parentInfo) {
+        qDebug() << r->errorString();
+        parentInfo->_lastErrorString = r->errorString();
+
        if (r->error() == QNetworkReply::ContentNotFoundError) {
            parentInfo->_fetched = true;
        } else {
@@ -63,6 +63,7 @@ public:
        bool _fetched; // If we did the LSCOL for this folder already
        bool _fetching; // Whether a LSCOL job is currently running
        bool _hasError; // If the last fetching job ended in an error
+        QString _lastErrorString;
        bool _fetchingLabel; // Whether a 'fetching in progress' label is shown.

        bool _isUndecided; // undecided folders are the big folders that the user has not accepted yet
@@ -308,7 +308,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('/');
@@ -142,15 +142,11 @@ void OwncloudSetupWizard::slotDetermineAuthType(const QString &urlString)

 void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl& url, const QVariantMap &info)
 {
-    auto serverVersion = CheckServerJob::version(info);
-
    _ocWizard->appendToConfigurationLog(tr("<font color=\"green\">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/>")
                                        .arg(url.toString())
                                        .arg(Theme::instance()->appNameGUI())
                                        .arg(CheckServerJob::versionString(info))
-                                        .arg(serverVersion));
-
-    _ocWizard->account()->setServerVersion(serverVersion);
+                                        .arg(CheckServerJob::version(info)));

    QString p = url.path();
    if (p.endsWith("/status.php")) {
@@ -93,6 +93,7 @@ private:
    OwncloudWizard* _ocWizard;
    QString _initLocalFolder;
    QString _remoteFolder;
+
 };

 }
@@ -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);
@@ -23,7 +23,6 @@
 #include <QBuffer>
 #include <QClipboard>
 #include <QFileInfo>
-#include <QDesktopServices>

 namespace OCC {

@@ -54,10 +53,6 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
    _ui->pushButton_copy->setEnabled(false);
    connect(_ui->pushButton_copy, SIGNAL(clicked(bool)), SLOT(slotPushButtonCopyLinkPressed()));

-    _ui->pushButton_mail->setIcon(QIcon::fromTheme("mail-send"));
-    _ui->pushButton_mail->setEnabled(false);
-    connect(_ui->pushButton_mail, SIGNAL(clicked(bool)), SLOT(slotPushButtonMailLinkPressed()));
-
    // the following progress indicator widgets are added to layouts which makes them
    // automatically deleted once the dialog dies.
    _pi_link     = new QProgressIndicator();
@@ -229,7 +224,6 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
        if (share->getShareType() == Share::TypeLink) {
            _share = qSharedPointerDynamicCast<LinkShare>(share);
            _ui->pushButton_copy->show();
-            _ui->pushButton_mail->show();

            _ui->widget_shareLink->show();
            _ui->checkBox_shareLink->setChecked(true);
@@ -274,7 +268,6 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
            }

            setShareLink(_share->getLink().toString());
-            _ui->pushButton_mail->setEnabled(true);
            _ui->pushButton_copy->setEnabled(true);

            // Connect all shares signals to gui slots
@@ -331,7 +324,6 @@ void ShareLinkWidget::setShareLink( const QString& url )
    if( realUrl.isValid() ) {
        _shareUrl = url;
        _ui->pushButton_copy->setEnabled(true);
-        _ui->pushButton_mail->setEnabled(true);
    } else {
        _shareUrl.clear();
        _ui->_labelShareLink->setText(QString::null);
@@ -347,7 +339,6 @@ void ShareLinkWidget::slotDeleteShareFetched()
    _ui->lineEdit_password->clear();
    _ui->_labelShareLink->clear();
    _ui->pushButton_copy->setEnabled(false);
-    _ui->pushButton_mail->setEnabled(false);
    _ui->widget_shareLink->hide();
    _ui->lineEdit_password->hide();
    _ui->pushButton_setPassword->setEnabled(false);
@@ -375,9 +366,9 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
            _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
            _ui->checkBox_expire->setEnabled(false);
            _ui->checkBox_editing->setEnabled(false);
+            _ui->lineEdit_password->setEnabled(true);
            _ui->lineEdit_password->setFocus();
            _ui->pushButton_copy->hide();
-            _ui->pushButton_mail->hide();
            _ui->widget_shareLink->show();

            slotCheckBoxPasswordClicked();
@@ -423,7 +414,6 @@ void ShareLinkWidget::slotCreateShareRequiresPassword(const QString& message)
    _ui->lineEdit_password->setEnabled(true);
    _ui->lineEdit_password->setFocus();
    _ui->pushButton_copy->hide();
-    _ui->pushButton_mail->hide();
    _ui->widget_shareLink->show();
    _ui->checkBox_expire->setEnabled(false);
    _ui->checkBox_editing->setEnabled(false);
@@ -443,6 +433,7 @@ void ShareLinkWidget::slotCheckBoxPasswordClicked()
        _ui->lineEdit_password->show();
        _ui->pushButton_setPassword->show();
        _ui->lineEdit_password->setPlaceholderText(tr("Please Set Password"));
+        _ui->lineEdit_password->setEnabled(true);
        _ui->lineEdit_password->setFocus();
    } else {
        setPassword(QString());
@@ -484,19 +475,6 @@ void ShareLinkWidget::slotPushButtonCopyLinkPressed()
 #endif
 }

-void ShareLinkWidget::slotPushButtonMailLinkPressed()
-{
-    QString fileName = _sharePath.mid(_sharePath.lastIndexOf('/') + 1);
-
-    QDesktopServices::openUrl(QUrl(QString(
-            "mailto: "
-            "?subject=I shared %1 with you"
-            "&body=%2").arg(
-            fileName,
-            _shareUrl),
-        QUrl::TolerantMode));
-}
-
 void ShareLinkWidget::slotCheckBoxEditingClicked()
 {
    ShareLinkWidget::setPublicUpload(_ui->checkBox_editing->checkState() == Qt::Checked);
@@ -68,7 +68,6 @@ private slots:
    void slotPasswordReturnPressed();
    void slotPasswordChanged(const QString& newText);
    void slotPushButtonCopyLinkPressed();
-    void slotPushButtonMailLinkPressed();
    void slotCheckBoxEditingClicked();
    void slotPublicUploadSet();

@@ -195,13 +195,6 @@
          </property>
         </widget>
        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_mail">
-          <property name="text">
-           <string>&amp;Mail link</string>
-          </property>
-         </widget>
-        </item>
        <item>
         <widget class="QPushButton" name="pushButton_copy">
          <property name="text">
@@ -171,9 +171,7 @@ void SocketApi::slotReadSocket()
    Q_ASSERT(socket);

    while(socket->canReadLine()) {
-        // Make sure to normalize the input from the socket to
-        // make sure that the path will match, especially on OS X.
-        QString line = QString::fromUtf8(socket->readLine()).normalized(QString::NormalizationForm_C);
+        QString line = QString::fromUtf8(socket->readLine());
        line.chop(1); // remove the '\n'
        QString command = line.split(":").value(0);
        QString function = QString(QLatin1String("command_")).append(command);
@@ -87,7 +87,7 @@ QString SyncRunFileLog::instructionToStr( csync_instructions_e inst )
 }


-void SyncRunFileLog::start(const QString &folderPath)
+void SyncRunFileLog::start(const QString &folderPath,  const Utility::StopWatch &stopWatch )
 {
    const qint64 logfileMaxSize = 1024*1024; // 1MiB

@@ -108,6 +108,8 @@ void SyncRunFileLog::start(const QString &folderPath)
    _file->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);
    _out.setDevice( _file.data() );

+    QDateTime dt = stopWatch.startTime();
+    QDateTime de = stopWatch.timeOfLap(QLatin1String("Sync Finished"));

    if (!exists) {
        // We are creating a new file, add the note.
@@ -120,9 +122,8 @@ void SyncRunFileLog::start(const QString &folderPath)
    }


-    _totalDuration.start();
-    _lapDuration.start();
-    _out << "#=#=#=# Syncrun started " << dateTimeStr(QDateTime::currentDateTime()) << endl;
+    _out << "#=#=#=# Syncrun started " << dateTimeStr(dt) << " until " << dateTimeStr(de) << " ("
+            << stopWatch.durationOfLap(QLatin1String("Sync Finished")) << " msec)" << endl;
 }

 void SyncRunFileLog::logItem( const SyncFileItem& item )
@@ -161,18 +162,8 @@ void SyncRunFileLog::logItem( const SyncFileItem& item )
    _out << endl;
 }

-void SyncRunFileLog::logLap(const QString& name)
+void SyncRunFileLog::close()
 {
-    _out << "#=#=#=#=# " << name << " " << dateTimeStr(QDateTime::currentDateTime())
-         << " (last step: " << _lapDuration.restart() << " msec"
-         << ", total: " << _totalDuration.elapsed() << " msec)" << endl;
-}
-
-void SyncRunFileLog::finish()
-{
-    _out << "#=#=#=# Syncrun finished " << dateTimeStr(QDateTime::currentDateTime())
-         << " (last step: " << _lapDuration.elapsed() << " msec"
-         << ", total: " << _totalDuration.elapsed() << " msec)" << endl;
    _file->close();
 }

@@ -17,9 +17,9 @@
 #include <QFile>
 #include <QTextStream>
 #include <QScopedPointer>
-#include <QElapsedTimer>

 #include "syncfileitem.h"
+#include "utility.h"

 namespace OCC {
 class SyncFileItem;
@@ -32,10 +32,9 @@ class SyncRunFileLog
 {
 public:
    SyncRunFileLog();
-    void start( const QString& folderPath );
+    void start( const QString& folderPath, const Utility::StopWatch& stopWatch );
    void logItem( const SyncFileItem& item );
-    void logLap( const QString& name );
-    void finish();
+    void close();

 protected:

@@ -46,8 +45,7 @@ private:

    QScopedPointer<QFile> _file;
    QTextStream _out;
-    QElapsedTimer _totalDuration;
-    QElapsedTimer _lapDuration;
+
 };
 }

@@ -76,6 +76,15 @@ void OwncloudAdvancedSetupPage::setupCustomization()
    _ui.topLabel->hide();
    _ui.bottomLabel->hide();

+    Theme *theme = Theme::instance();
+    QVariant variant = theme->customMedia( Theme::oCSetupTop );
+    if( !variant.isNull() ) {
+        WizardCommon::setupCustomMedia( variant, _ui.topLabel );
+    }
+
+    variant = theme->customMedia( Theme::oCSetupBottom );
+    WizardCommon::setupCustomMedia( variant, _ui.bottomLabel );
+}

 bool OwncloudAdvancedSetupPage::isComplete() const
 {
@@ -71,6 +71,15 @@ void OwncloudHttpCredsPage::setupCustomization()
    // set defaults for the customize labels.
    _ui.topLabel->hide();
    _ui.bottomLabel->hide();
+
+    Theme *theme = Theme::instance();
+    QVariant variant = theme->customMedia( Theme::oCSetupTop );
+    if( !variant.isNull() ) {
+        WizardCommon::setupCustomMedia( variant, _ui.topLabel );
+    }
+
+    variant = theme->customMedia( Theme::oCSetupBottom );
+    WizardCommon::setupCustomMedia( variant, _ui.bottomLabel );
 }

 void OwncloudHttpCredsPage::initializePage()
@@ -105,8 +114,6 @@ void OwncloudHttpCredsPage::initializePage()
            _ui.lePassword->setText(password);
        }
    }
-    _ui.tokenLabel->setText(HttpCredentialsGui::requestAppPasswordText(ocWizard->account().data()));
-    _ui.tokenLabel->setVisible(!_ui.tokenLabel->text().isEmpty());
    _ui.leUsername->setFocus();
 }

@@ -7,30 +7,14 @@
    <x>0</x>
    <y>0</y>
    <width>350</width>
-    <height>248</height>
+    <height>196</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>Form</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="5" column="1">
-    <layout class="QHBoxLayout" name="resultLayout"/>
-   </item>
-   <item row="0" column="0" colspan="3">
-    <widget class="QLabel" name="topLabel">
-     <property name="text">
-      <string notr="true">TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="1" column="0">
    <spacer name="horizontalSpacer">
     <property name="orientation">
      <enum>Qt::Horizontal</enum>
@@ -46,23 +30,7 @@
     </property>
    </spacer>
   </item>
-   <item row="3" column="2">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>48</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="1">
+   <item row="1" column="1">
    <layout class="QFormLayout" name="formLayout">
     <item row="0" column="0">
      <widget class="QLabel" name="usernameLabel">
@@ -75,7 +43,7 @@
      </widget>
     </item>
     <item row="1" column="0">
-      <widget class="QLabel" name="passwordLabel">
+      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>&amp;Password</string>
       </property>
@@ -87,7 +55,7 @@
     <item row="2" column="0" colspan="2">
      <widget class="QLabel" name="errorLabel">
       <property name="text">
-        <string notr="true">Error Label</string>
+        <string>Error Label</string>
       </property>
       <property name="openExternalLinks">
        <bool>true</bool>
@@ -106,7 +74,7 @@
     </item>
    </layout>
   </item>
-   <item row="4" column="1">
+   <item row="2" column="1">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
@@ -119,23 +87,42 @@
     </property>
    </spacer>
   </item>
-   <item row="6" column="0" colspan="3">
-    <widget class="QLabel" name="bottomLabel">
-     <property name="text">
-      <string notr="true">TextLabel</string>
+   <item row="1" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
     </property>
-    </widget>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>48</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
   </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="tokenLabel">
+   <item row="3" column="1">
+    <layout class="QHBoxLayout" name="resultLayout"/>
+   </item>
+   <item row="0" column="0" colspan="3">
+    <widget class="QLabel" name="topLabel">
     <property name="text">
-      <string notr="true">TextLabel</string>
+      <string>TextLabel</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
     </property>
     <property name="wordWrap">
      <bool>true</bool>
     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="bottomLabel">
+     <property name="text">
+      <string>TextLabel</string>
     </property>
    </widget>
   </item>
@@ -85,12 +85,20 @@ void OwncloudSetupPage::setServerUrl( const QString& newUrl )
    _ui.leUrl->setText( _oCUrl );
 }

-// TODO: remove me after removing top/bottom label
 void OwncloudSetupPage::setupCustomization()
 {
    // set defaults for the customize labels.
    _ui.topLabel->hide();
    _ui.bottomLabel->hide();
+
+    Theme *theme = Theme::instance();
+    QVariant variant = theme->customMedia( Theme::oCSetupTop );
+    if( !variant.isNull() ) {
+        WizardCommon::setupCustomMedia( variant, _ui.topLabel );
+    }
+
+    variant = theme->customMedia( Theme::oCSetupBottom );
+    WizardCommon::setupCustomMedia( variant, _ui.bottomLabel );
 }

 // slot hit from textChanged of the url entry field.
@@ -26,6 +26,26 @@ namespace OCC
 namespace WizardCommon
 {

+void setupCustomMedia( const QVariant& variant, QLabel *label )
+{
+    if( !label ) return;
+
+    QPixmap pix = variant.value<QPixmap>();
+    if( !pix.isNull() ) {
+        label->setPixmap(pix);
+        label->setAlignment( Qt::AlignTop | Qt::AlignRight );
+        label->setVisible(true);
+    } else {
+        QString str = variant.toString();
+        if( !str.isEmpty() ) {
+            label->setText( str );
+            label->setTextFormat( Qt::RichText );
+            label->setVisible(true);
+            label->setOpenExternalLinks(true);
+        }
+    }
+}
+
 QString titleTemplate()
 {
  return QString::fromLatin1("<font color=\"%1\" size=\"5\">").arg(Theme::instance()->wizardHeaderTitleColor().name()) + QString::fromLatin1("%1</font>");
@@ -84,6 +84,9 @@ void OwncloudWizardResultPage::setupCustomization()
    // set defaults for the customize labels.
    _ui.topLabel->setText( QString::null );
    _ui.topLabel->hide();
+
+    QVariant variant = Theme::instance()->customMedia( Theme::oCSetupResultTop );
+    WizardCommon::setupCustomMedia( variant, _ui.topLabel );
 }

 void OwncloudWizardResultPage::slotOpenLocal()
@@ -43,7 +43,7 @@ namespace OCC {
 AbstractNetworkJob::AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent)
    : QObject(parent)
    , _timedout(false)
-    , _followRedirects(true)
+    , _followRedirects(false)
    , _account(account)
    , _ignoreCredentialFailure(false)
    , _reply(0)
@@ -106,7 +106,7 @@ void ConnectionValidator::slotCheckServerAndAuth()
    checkJob->setTimeout(timeoutToUseMsec);
    checkJob->setIgnoreCredentialFailure(true);
    connect(checkJob, SIGNAL(instanceFound(QUrl,QVariantMap)), SLOT(slotStatusFound(QUrl,QVariantMap)));
-    connect(checkJob, SIGNAL(networkError(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
+    connect(checkJob, SIGNAL(instanceNotFound(QNetworkReply*)), SLOT(slotNoStatusFound(QNetworkReply*)));
    connect(checkJob, SIGNAL(timeout(QUrl)), SLOT(slotJobTimeout(QUrl)));
    checkJob->start();
 }
@@ -210,7 +210,7 @@ int get_errno_from_http_errcode( int err, const QString & reason ) {


 DiscoverySingleDirectoryJob::DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent)
-    : QObject(parent), _subPath(path), _account(account), _ignoredFirst(false), _isRootPath(false)
+    : QObject(parent), _subPath(path), _account(account), _ignoredFirst(false)
 {
 }

@@ -218,15 +218,10 @@ void DiscoverySingleDirectoryJob::start()
 {
    // Start the actual HTTP job
    LsColJob *lsColJob = new LsColJob(_account, _subPath, this);
-
-    QList<QByteArray> props;
-    props << "resourcetype" << "getlastmodified" << "getcontentlength" << "getetag"
-          << "http://owncloud.org/ns:id" << "http://owncloud.org/ns:downloadURL"
-          << "http://owncloud.org/ns:dDC" << "http://owncloud.org/ns:permissions";
-    if (_isRootPath)
-        props << "http://owncloud.org/ns:data-fingerprint";
-
-    lsColJob->setProperties(props);
+    lsColJob->setProperties(QList<QByteArray>() << "resourcetype" << "getlastmodified"
+                        << "getcontentlength" << "getetag" << "http://owncloud.org/ns:id"
+                        << "http://owncloud.org/ns:downloadURL" << "http://owncloud.org/ns:dDC"
+                        << "http://owncloud.org/ns:permissions");

    QObject::connect(lsColJob, SIGNAL(directoryListingIterated(QString,QMap<QString,QString>)),
                     this, SLOT(directoryListingIteratedSlot(QString,QMap<QString,QString>)));
@@ -304,14 +299,12 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
 {
    //qDebug() << Q_FUNC_INFO << _subPath << file << map.count() << map.keys() << _account->davPath() << _lsColJob->reply()->request().url().path();
    if (!_ignoredFirst) {
-        // The first entry is for the folder itself, we should process it differently.
+        // First result is the directory itself. Maybe should have a better check for that? FIXME
        _ignoredFirst = true;
        if (map.contains("permissions")) {
            emit firstDirectoryPermissions(map.value("permissions"));
        }
-        if (map.contains("data-fingerprint")) {
-            _dataFingerprint = map.value("data-fingerprint").toUtf8();
-        }
+
    } else {
        // Remove <webDAV-Url>/folder/ from <webDAV-Url>/folder/subfile.txt
        file.remove(0, _lsColJob->reply()->request().url().path().length());
@@ -433,11 +426,6 @@ void DiscoveryMainThread::doOpendirSlot(const QString &subPath, DiscoveryDirecto
                     this, SIGNAL(etagConcatenation(QString)));
    QObject::connect(_singleDirJob, SIGNAL(etag(QString)),
                     this, SIGNAL(etag(QString)));
-
-    if (!_firstFolderProcessed) {
-        _singleDirJob->setIsRootPath();
-    }
-
    _singleDirJob->start();
 }

@@ -453,12 +441,7 @@ void DiscoveryMainThread::singleDirectoryJobResultSlot(const QList<FileStatPoint
    _currentDiscoveryDirectoryResult->list = result;
    _currentDiscoveryDirectoryResult->code = 0;
    _currentDiscoveryDirectoryResult->listIndex = 0;
-    _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now
-
-    if (!_firstFolderProcessed) {
-        _firstFolderProcessed = true;
-        _dataFingerprint = _singleDirJob->_dataFingerprint;
-    }
+     _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now

    _discoveryJob->_vioMutex.lock();
    _discoveryJob->_vioWaitCondition.wakeAll();
@@ -581,7 +564,7 @@ csync_vio_handle_t* DiscoveryJob::remote_vio_opendir_hook (const char *url,
        discoveryJob->_vioMutex.lock();
        const QString qurl = QString::fromUtf8(url);
        emit discoveryJob->doOpendirSignal(qurl, directoryResult.data());
-        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, 30000);
+        discoveryJob->_vioWaitCondition.wait(&discoveryJob->_vioMutex, ULONG_MAX); // FIXME timeout?
        discoveryJob->_vioMutex.unlock();

        qDebug() << discoveryJob << url << "...Returned from main thread";
@@ -81,8 +81,6 @@ class DiscoverySingleDirectoryJob : public QObject {
    Q_OBJECT
 public:
    explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = 0);
-    // Specify thgat this is the root and we need to check the data-fingerprint
-    void setIsRootPath() { _isRootPath = true; }
    void start();
    void abort();
    // This is not actually a network job, it is just a job
@@ -102,15 +100,8 @@ private:
    QString _etagConcatenation;
    QString _firstEtag;
    AccountPtr _account;
-    // The first result is for the directory itself and need to be ignored.
-    // This flag is true if it was already ignored.
    bool _ignoredFirst;
-    // Set to true if this is the root path and we need to check the data-fingerprint
-    bool _isRootPath;
    QPointer<LsColJob> _lsColJob;
-
-public:
-    QByteArray _dataFingerprint;
 };

 // Lives in main thread. Deleted by the SyncEngine
@@ -124,16 +115,13 @@ class DiscoveryMainThread : public QObject {
    AccountPtr _account;
    DiscoveryDirectoryResult *_currentDiscoveryDirectoryResult;
    qint64 *_currentGetSizeResult;
-    bool _firstFolderProcessed;

 public:
    DiscoveryMainThread(AccountPtr account) : QObject(), _account(account),
-        _currentDiscoveryDirectoryResult(0), _currentGetSizeResult(0), _firstFolderProcessed(false)
+        _currentDiscoveryDirectoryResult(0), _currentGetSizeResult(0)
    { }
    void abort();

-    QByteArray _dataFingerprint;
-

 public slots:
    // From DiscoveryJob:
@@ -12,6 +12,7 @@
 */

 #include "excludedfiles.h"
+#include "utility.h"

 #include <QFileInfo>

@@ -63,7 +64,7 @@ bool ExcludedFiles::isExcluded(
        const QString& basePath,
        bool excludeHidden) const
 {
-    if (!filePath.startsWith(basePath)) {
+    if (!filePath.startsWith(basePath, Utility::fsCasePreserving() ? Qt::CaseInsensitive : Qt::CaseSensitive)) {
        // Mark paths we're not responsible for as excluded...
        return true;
    }
@@ -359,6 +359,7 @@ CheckServerJob::CheckServerJob(AccountPtr account, QObject *parent)
    : AbstractNetworkJob(account, QLatin1String(statusphpC) , parent)
    , _subdirFallback(false)
 {
+	_followRedirects = true;
    setIgnoreCredentialFailure(true);
 }

@@ -402,7 +402,7 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
    connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
            this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_rootJob.data(), SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
-    connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished(SyncFileItem::Status)));
+    connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished()));
    connect(_rootJob.data(), SIGNAL(ready()), this, SLOT(scheduleNextJob()), Qt::QueuedConnection);

    qDebug() << "Using QNAM/HTTP parallel code path";
@@ -542,6 +542,27 @@ void OwncloudPropagator::scheduleNextJob()
    }
 }

+void OwncloudPropagator::addTouchedFile(const QString& fn)
+{
+    QString file = QDir::cleanPath(fn);
+
+    QElapsedTimer timer;
+    timer.start();
+
+    QMutexLocker lock(&_touchedFilesMutex);
+    _touchedFiles.insert(file, timer);
+}
+
+qint64 OwncloudPropagator::timeSinceFileTouched(const QString& fn) const
+{
+    QMutexLocker lock(&_touchedFilesMutex);
+    if (! _touchedFiles.contains(fn)) {
+        return -1;
+    }
+
+    return _touchedFiles[fn].elapsed();
+}
+
 AccountPtr OwncloudPropagator::account() const
 {
    return _account;
@@ -674,6 +695,12 @@ void PropagateDirectory::finalize()
    bool ok = true;
    if (!_item->isEmpty() && _hasError == SyncFileItem::NoStatus) {
        if( !_item->_renameTarget.isEmpty() ) {
+            if(_item->_instruction == CSYNC_INSTRUCTION_RENAME
+                    && _item->_originalFile != _item->_renameTarget) {
+                // Remove the stale entries from the database.
+                _propagator->_journal->deleteFileRecord(_item->_originalFile, true);
+            }
+
            _item->_file = _item->_renameTarget;
        }

@@ -321,7 +321,7 @@ public:
        if (_rootJob) {
            _rootJob->abort();
        }
-        emitFinished(SyncFileItem::NormalError);
+        emitFinished();
    }

    // timeout in seconds
@@ -330,6 +330,18 @@ public:
    /** returns the size of chunks in bytes  */
    static quint64 chunkSize();

+    /** Records that a file was touched by a job.
+     *
+     * Thread-safe.
+     */
+    void addTouchedFile(const QString& fn);
+
+    /** Get the ms since a file was touched, or -1 if it wasn't.
+     *
+     * Thread-safe.
+     */
+    qint64 timeSinceFileTouched(const QString& fn) const;
+
    AccountPtr account() const;

    enum DiskSpaceResult
@@ -349,9 +361,9 @@ public:
 private slots:

    /** Emit the finished signal and make sure it is only emitted once */
-    void emitFinished(SyncFileItem::Status status) {
+    void emitFinished() {
        if (!_finishedEmited)
-            emit finished(status == SyncFileItem::Success);
+            emit finished();
        _finishedEmited = true;
    }

@@ -360,29 +372,23 @@ private slots:
 signals:
    void itemCompleted(const SyncFileItem &, const PropagatorJob &);
    void progress(const SyncFileItem&, quint64 bytes);
-    void finished(bool success);
+    void finished();

    /** Emitted when propagation has problems with a locked file. */
    void seenLockedFile(const QString &fileName);

-    /** Emitted when propagation touches a file.
-     *
-     * Used to track our own file modifications such that notifications
-     * from the file watcher about these can be ignored.
-     */
-    void touchedFile(const QString &fileName);
-
 private:

    AccountPtr _account;

+    /** Stores the time since a job touched a file. */
+    QHash<QString, QElapsedTimer> _touchedFiles;
+    mutable QMutex _touchedFilesMutex;
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    // access to signals which are protected in Qt4
    friend class PropagateDownloadFileQNAM;
    friend class PropagateUploadFileQNAM;
-    friend class PropagateLocalMkdir;
-    friend class PropagateLocalRename;
-    friend class PropagateRemoteMove;
 #endif
 };

@@ -72,6 +72,21 @@ QIcon ownCloudTheme::applicationIcon( ) const
 {
    return themeIcon( QLatin1String("owncloud-icon") );
 }
+
+
+QVariant ownCloudTheme::customMedia(Theme::CustomMediaType type)
+{
+    if (type == Theme::oCSetupTop) {
+        // return QCoreApplication::translate("ownCloudTheme",
+        //                                   "If you don't have an ownCloud server yet, "
+        //                                   "see <a href=\"https://owncloud.com\">owncloud.com</a> for more info.",
+        //                                   "Top text in setup wizard. Keep short!");
+        return QVariant();
+    } else {
+        return QVariant();
+    }
+}
+
 #endif

 QString ownCloudTheme::helpUrl() const
@@ -41,6 +41,8 @@ public:

    QString helpUrl() const Q_DECL_OVERRIDE;
 #ifndef TOKEN_AUTH_ONLY
+    QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE;
+
    QColor  wizardHeaderBackgroundColor() const Q_DECL_OVERRIDE;
    QColor  wizardHeaderTitleColor() const Q_DECL_OVERRIDE;
    QPixmap wizardHeaderLogo() const Q_DECL_OVERRIDE;
@@ -303,11 +303,6 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
                res = sqlite3_bind_null(_stmt, pos);
            }
            break; }
-        case QVariant::ByteArray: {
-            auto ba = value.toByteArray();
-            res = sqlite3_bind_text(_stmt, pos, ba.constData(), ba.size(), SQLITE_TRANSIENT);
-            break;
-        }
        default: {
            QString str = value.toString();
            // SQLITE_TRANSIENT makes sure that sqlite buffers the data
@@ -317,7 +312,7 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
        }
    }
    if (res != SQLITE_OK) {
-        qDebug() << Q_FUNC_INFO << "ERROR" << value << res;
+        qDebug() << Q_FUNC_INFO << "ERROR" << value.toString() << res;
    }
    Q_ASSERT( res == SQLITE_OK );
 }
@@ -99,6 +99,7 @@ void GETFileJob::start() {
    } else {
        // Use direct URL
        setReply(davRequest("GET", _directDownloadUrl, req));
+        _followRedirects = true;  // (follow redirections for the direct download)
    }
    setupConnections(reply());

@@ -591,8 +592,8 @@ void PropagateDownloadFileQNAM::deleteExistingFolder()
    QString conflictDir = FileSystem::makeConflictFileName(
            existingDir, Utility::qDateTimeFromTime_t(_item->_modtime));

-    emit _propagator->touchedFile(existingDir);
-    emit _propagator->touchedFile(conflictDir);
+    _propagator->addTouchedFile(existingDir);
+    _propagator->addTouchedFile(conflictDir);
    QString renameError;
    if (!FileSystem::rename(existingDir, conflictDir, &renameError)) {
        done(SyncFileItem::NormalError, renameError);
@@ -616,29 +617,47 @@ static QString makeRecallFileName(const QString &fn)
    return recallFileName;
 }

-static void handleRecallFile(const QString &fn)
+void handleRecallFile(const QString& filePath, const QString& folderPath, SyncJournalDb& journal)
 {
-    qDebug() << "handleRecallFile: " << fn;
+    qDebug() << "handleRecallFile: " << filePath;

-    FileSystem::setFileHidden(fn, true);
+    FileSystem::setFileHidden(filePath, true);

-    QFile file(fn);
+    QFile file(filePath);
    if (!file.open(QIODevice::ReadOnly)) {
        qWarning() << "Could not open recall file" << file.errorString();
        return;
    }
-    QFileInfo existingFile(fn);
-    QDir thisDir = existingFile.dir();
+    QFileInfo existingFile(filePath);
+    QDir baseDir = existingFile.dir();

    while (!file.atEnd()) {
        QByteArray line = file.readLine();
        line.chop(1); // remove trailing \n
-        QString fpath = thisDir.filePath(line);
-        QString rpath = makeRecallFileName(fpath);

-        qDebug() << "Copy recall file: " << fpath << " -> " << rpath;
-        QString error;
-        FileSystem::uncheckedRenameReplace(fpath, rpath, &error);
+        QString recalledFile = QDir::cleanPath(baseDir.filePath(line));
+        if (!recalledFile.startsWith(folderPath) || !recalledFile.startsWith(baseDir.path())) {
+            qDebug() << "Ignoring recall of " << recalledFile;
+            continue;
+        }
+
+        // Path of the recalled file in the local folder
+        QString localRecalledFile = recalledFile.mid(folderPath.size());
+
+        SyncJournalFileRecord record = journal.getFileRecord(localRecalledFile);
+        if (!record.isValid()) {
+            qDebug() << "No db entry for recall of" << localRecalledFile;
+            continue;
+        }
+
+        qDebug() << "Recalling" << localRecalledFile << "Checksum:" << record._contentChecksumType << record._contentChecksum;
+
+        QString targetPath = makeRecallFileName(recalledFile);
+
+        qDebug() << "Copy recall file: " << recalledFile << " -> " << targetPath;
+        // Remove the target first, QFile::copy will not overwrite it.
+        FileSystem::remove(targetPath);
+        QFile::copy(recalledFile, targetPath);
    }
 }

@@ -752,7 +771,7 @@ void PropagateDownloadFileQNAM::downloadFinished()
    }

    QString error;
-    emit _propagator->touchedFile(fn);
+    _propagator->addTouchedFile(fn);
    // The fileChanged() check is done above to generate better error messages.
    if (!FileSystem::uncheckedRenameReplace(_tmpFile.fileName(), fn, &error)) {
        qDebug() << Q_FUNC_INFO << QString("Rename failed: %1 => %2").arg(_tmpFile.fileName()).arg(fn);
@@ -795,8 +814,10 @@ void PropagateDownloadFileQNAM::downloadFinished()
    done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success);

    // handle the special recall file
-    if(_item->_file == QLatin1String(".sys.admin#recall#") || _item->_file.endsWith("/.sys.admin#recall#")) {
-        handleRecallFile(fn);
+    if(!_item->_remotePerm.contains("S")
+            && (_item->_file == QLatin1String(".sys.admin#recall#")
+                || _item->_file.endsWith("/.sys.admin#recall#"))) {
+        handleRecallFile(fn, _propagator->_localDir, *_propagator->_journal);
    }

    qint64 duration = _stopwatch.elapsed();
@@ -80,8 +80,8 @@ void PropagateRemoteMove::start()
        QString versionString = _propagator->account()->serverVersion();
        if (versionString.contains('.') && versionString.split('.')[0].toInt() < 7) {
            QString originalFile(_propagator->getFilePath(QLatin1String("Shared")));
-            emit _propagator->touchedFile(originalFile);
-            emit _propagator->touchedFile(targetFile);
+            _propagator->addTouchedFile(originalFile);
+            _propagator->addTouchedFile(targetFile);
            QString renameError;
            if( FileSystem::rename(targetFile, originalFile, &renameError) ) {
                done(SyncFileItem::NormalError, tr("This folder must not be renamed. It is renamed back to its original name."));
@@ -163,7 +163,7 @@ void PropagateLocalMkdir::start()
        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
        return;
    }
-    emit _propagator->touchedFile(newDirStr);
+    _propagator->addTouchedFile(newDirStr);
    QDir localDir(_propagator->_localDir);
    if (!localDir.mkpath(_item->_file)) {
        done( SyncFileItem::NormalError, tr("could not create folder %1").arg(newDirStr) );
@@ -217,8 +217,8 @@ void PropagateLocalRename::start()
            return;
        }

-        emit _propagator->touchedFile(existingFile);
-        emit _propagator->touchedFile(targetFile);
+        _propagator->addTouchedFile(existingFile);
+        _propagator->addTouchedFile(targetFile);
        QString renameError;
        if (!FileSystem::rename(existingFile, targetFile, &renameError)) {
            done(SyncFileItem::NormalError, renameError);
@@ -95,10 +95,6 @@ SyncEngine::SyncEngine(AccountPtr account, const QString& localPath,
    _excludedFiles.reset(new ExcludedFiles(&_csync_ctx->excludes));
    _syncFileStatusTracker.reset(new SyncFileStatusTracker(this));

-    _clearTouchedFilesTimer.setSingleShot(true);
-    _clearTouchedFilesTimer.setInterval(30*1000);
-    connect(&_clearTouchedFilesTimer, SIGNAL(timeout()), SLOT(slotClearTouchedFiles()));
-
    _thread.setObjectName("SyncEngine_Thread");
 }

@@ -437,9 +433,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    case CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS:
        item->_errorString = tr("Filename contains invalid characters that can not be synced cross platform.");
        break;
-    case CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE:
-        item->_errorString = tr("Filename contains trailing spaces.");
-        break;
    case CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME:
        item->_errorString = tr("Filename is too long.");
        break;
@@ -688,7 +681,6 @@ void SyncEngine::startSync()
    s_anySyncRunning = true;
    _syncRunning = true;
    _anotherSyncNeeded = false;
-    _clearTouchedFilesTimer.stop();

    _progressInfo->reset();

@@ -725,19 +717,16 @@ void SyncEngine::startSync()

    int fileRecordCount = -1;
    if (!_journal->exists()) {
-        qDebug() << "===== new sync (no sync journal exists)";
+        qDebug() << "=====sync looks new (no DB exists)";
    } else {
-        qDebug() << "===== sync with existing sync journal";
+        qDebug() << "=====sync with existing DB";
    }

-    QString verStr("===== Using Qt ");
-    verStr.append( qVersion() );
-
+    qDebug() <<  "=====Using Qt" << qVersion();
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-    verStr.append( " SSL library " ).append(QSslSocket::sslLibraryVersionString().toUtf8().data());
+    qDebug() <<  "=====Using SSL library version"
+             <<  QSslSocket::sslLibraryVersionString().toUtf8().data();
 #endif
-    verStr.append( " on ").append(Utility::platformName());
-    qDebug() << verStr;

    fileRecordCount = _journal->getFileRecordCount(); // this creates the DB if it does not exist yet

@@ -862,9 +851,12 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)

    _hasNoneFiles = false;
    _hasRemoveFile = false;
+    _hasForwardInTimeFiles = false;
+    _backInTimeFiles = 0;
    bool walkOk = true;
    _seenFiles.clear();
    _temporarilyUnavailablePaths.clear();
+    _renamedFolders.clear();

    if( csync_walk_local_tree(_csync_ctx, &treewalkLocal, 0) < 0 ) {
        qDebug() << "Error in local treewalk.";
@@ -915,16 +907,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
            return;
        }
    }
-
-    auto databaseFingerprint = _journal->dataFingerprint();
-    // If databaseFingerprint is null, this means that there was no information in the database
-    // (for example, upgrading from a previous version, or first sync)
-    // Note that an empty ("") fingerprint is valid and means it was empty on the server before.
-    if (!databaseFingerprint.isNull()
-            && _discoveryMainThread->_dataFingerprint != databaseFingerprint) {
-        qDebug() << "data fingerprint changed, assume restore from backup" << databaseFingerprint << _discoveryMainThread->_dataFingerprint;
-        restoreOldFiles();
-    } else if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2) {
+    if (!_hasForwardInTimeFiles && _backInTimeFiles >= 2) {
        qDebug() << "All the changes are bringing files in the past, asking the user";
        // this typically happen when a backup is restored on the server
        bool restore = false;
@@ -967,9 +950,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
            this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
    connect(_propagator.data(), SIGNAL(progress(const SyncFileItem &,quint64)),
            this, SLOT(slotProgress(const SyncFileItem &,quint64)));
-    connect(_propagator.data(), SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)), Qt::QueuedConnection);
+    connect(_propagator.data(), SIGNAL(finished()), this, SLOT(slotFinished()), Qt::QueuedConnection);
    connect(_propagator.data(), SIGNAL(seenLockedFile(QString)), SIGNAL(seenLockedFile(QString)));
-    connect(_propagator.data(), SIGNAL(touchedFile(QString)), SLOT(slotAddTouchedFile(QString)));

    // apply the network limits to the propagator
    setNetworkLimits(_uploadLimit, _downloadLimit);
@@ -1035,14 +1017,10 @@ void SyncEngine::slotItemCompleted(const SyncFileItem &item, const PropagatorJob
    emit itemCompleted(item, job);
 }

-void SyncEngine::slotFinished(bool success)
+void SyncEngine::slotFinished()
 {
    _anotherSyncNeeded = _anotherSyncNeeded || _propagator->_anotherSyncNeeded;

-    if (success) {
-        _journal->setDataFingerprint(_discoveryMainThread->_dataFingerprint);
-    }
-
    // emit the treewalk results.
    if( ! _journal->postSyncCleanup( _seenFiles, _temporarilyUnavailablePaths ) ) {
        qDebug() << "Cleaning of synced ";
@@ -1050,7 +1028,7 @@ void SyncEngine::slotFinished(bool success)

    _journal->commit("All Finished.", false);
    emit treeWalkResult(_syncedItems);
-    finalize(success);
+    finalize(true); // FIXME: should it be true if there was errors?
 }

 void SyncEngine::finalize(bool success)
@@ -1070,8 +1048,6 @@ void SyncEngine::finalize(bool success)

    // Delete the propagator only after emitting the signal.
    _propagator.clear();
-
-    _clearTouchedFilesTimer.start();
 }

 void SyncEngine::slotProgress(const SyncFileItem& item, quint64 current)
@@ -1393,28 +1369,14 @@ SyncFileItem* SyncEngine::findSyncItem(const QString &fileName) const
    return 0;
 }

-void SyncEngine::slotAddTouchedFile(const QString& fn)
-{
-    QString file = QDir::cleanPath(fn);
-
-    QElapsedTimer timer;
-    timer.start();
-
-    _touchedFiles.insert(file, timer);
-}
-
-void SyncEngine::slotClearTouchedFiles()
-{
-    _touchedFiles.clear();
-}
-
 qint64 SyncEngine::timeSinceFileTouched(const QString& fn) const
 {
-    if (! _touchedFiles.contains(fn)) {
-        return -1;
+    // This copy is essential for thread safety.
+    QSharedPointer<OwncloudPropagator> prop = _propagator;
+    if (prop) {
+        return prop->timeSinceFileTouched(fn);
    }
-
-    return _touchedFiles[fn].elapsed();
+    return -1;
 }

 AccountPtr SyncEngine::account() const
@@ -152,17 +152,11 @@ signals:
 private slots:
    void slotRootEtagReceived(const QString &);
    void slotItemCompleted(const SyncFileItem& item, const PropagatorJob & job);
-    void slotFinished(bool success);
+    void slotFinished();
    void slotProgress(const SyncFileItem& item, quint64 curent);
    void slotDiscoveryJobFinished(int updateResult);
    void slotCleanPollsJobAborted(const QString &error);

-    /** Records that a file was touched by a job. */
-    void slotAddTouchedFile(const QString& fn);
-
-    /** Wipes the _touchedFiles hash */
-    void slotClearTouchedFiles();
-
 private:
    void handleSyncError(CSYNC *ctx, const char *state);

@@ -262,12 +256,6 @@ private:
    CSyncChecksumHook _checksum_hook;

    bool _anotherSyncNeeded;
-
-    /** Stores the time since a job touched a file. */
-    QHash<QString, QElapsedTimer> _touchedFiles;
-
-    /** For clearing the _touchedFiles variable after sync finished */
-    QTimer _clearTouchedFilesTimer;
 };

 }
@@ -93,9 +93,11 @@ SyncFileItem SyncFileStatusTracker::rootSyncFileItem()

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

-    if (relativePath.isEmpty()) {
+    if (normalizedRelativePath.isEmpty()) {
        // This is the root sync folder, it doesn't have an entry in the database and won't be walked by csync, so create one manually.
        return syncFileItemStatus(rootSyncFileItem());
    }
@@ -106,22 +108,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() + normalizedRelativePath,
                                                _syncEngine->localPath(),
                                                _syncEngine->ignoreHiddenFiles()) ) {
        return SyncFileStatus(SyncFileStatus::StatusWarning);
    }

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

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

    // If we're not currently syncing that file, look it up in the database to know if it's shared
-    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(relativePath);
+    SyncJournalFileRecord rec = _syncEngine->journal()->getFileRecord(normalizedRelativePath);
    if (rec.isValid()) {
        return syncFileItemStatus(rec.toSyncFileItem());
    }
@@ -162,7 +164,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector& items)
    // Swap into a copy since fileStatus() reads _dirtyPaths to determine the status
    QSet<QString> oldDirtyPaths;
    std::swap(_dirtyPaths, oldDirtyPaths);
-    for (auto it = oldDirtyPaths.constBegin(); it != oldDirtyPaths.constEnd(); ++it)
+    for (auto it = oldDirtyPaths.begin(); it != oldDirtyPaths.end(); ++it)
        emit fileStatusChanged(getSystemDestination(*it), fileStatus(*it));

    // Make sure to push any status that might have been resolved indirectly since the last sync
@@ -286,13 +286,6 @@ bool SyncJournalDb::checkConnect()
        return sqlFail("Create table version", createQuery);
    }

-    // create the checksumtype table.
-    createQuery.prepare("CREATE TABLE IF NOT EXISTS datafingerprint("
-                        "fingerprint TEXT UNIQUE"
-                        ");");
-    if (!createQuery.exec()) {
-        return sqlFail("Create table datafingerprint", createQuery);
-    }

    createQuery.prepare("CREATE TABLE IF NOT EXISTS version("
                               "major INTEGER(8),"
@@ -443,14 +436,6 @@ bool SyncJournalDb::checkConnect()
    _insertChecksumTypeQuery.reset(new SqlQuery(_db));
    _insertChecksumTypeQuery->prepare("INSERT OR IGNORE INTO checksumtype (name) VALUES (?1)");

-    _getDataFingerprintQuery.reset(new SqlQuery(_db));
-    _getDataFingerprintQuery->prepare("SELECT fingerprint FROM datafingerprint");
-
-    _setDataFingerprintQuery1.reset(new SqlQuery(_db));
-    _setDataFingerprintQuery1->prepare("DELETE FROM datafingerprint;");
-    _setDataFingerprintQuery2.reset(new SqlQuery(_db));
-    _setDataFingerprintQuery2->prepare("INSERT INTO datafingerprint (fingerprint) VALUES (?1);");
-
    // don't start a new transaction now
    commitInternal(QString("checkConnect End"), false);

@@ -487,9 +472,6 @@ void SyncJournalDb::close()
    _getChecksumTypeIdQuery.reset(0);
    _getChecksumTypeQuery.reset(0);
    _insertChecksumTypeQuery.reset(0);
-    _getDataFingerprintQuery.reset(0);
-    _setDataFingerprintQuery1.reset(0);
-    _setDataFingerprintQuery2.reset(0);

    _db.close();
    _avoidReadFromDbOnNextSyncFilter.clear();
@@ -1620,49 +1602,6 @@ int SyncJournalDb::mapChecksumType(const QByteArray& checksumType)
    return _getChecksumTypeIdQuery->intValue(0);
 }

-QByteArray SyncJournalDb::dataFingerprint()
-{
-    QMutexLocker locker(&_mutex);
-    if (!checkConnect()) {
-        return QByteArray();
-    }
-
-    _getDataFingerprintQuery->reset_and_clear_bindings();
-    if (!_getDataFingerprintQuery->exec()) {
-        qWarning() << "Error SQL statement dataFingerprint: "
-                   << _getDataFingerprintQuery->lastQuery() << " :"
-                   << _getDataFingerprintQuery->error();
-        return QByteArray();
-    }
-
-    if (!_getDataFingerprintQuery->next()) {
-        return QByteArray();
-    }
-    return _getDataFingerprintQuery->baValue(0);
-}
-
-void SyncJournalDb::setDataFingerprint(const QByteArray &dataFingerprint)
-{
-    QMutexLocker locker(&_mutex);
-    if (!checkConnect()) {
-        return;
-    }
-
-    _setDataFingerprintQuery1->reset_and_clear_bindings();
-    if (!_setDataFingerprintQuery1->exec()) {
-        qWarning() << "Error SQL statement setDataFingerprint1: "
-                   << _setDataFingerprintQuery1->lastQuery() << " :"
-                   << _setDataFingerprintQuery1->error();
-    }
-
-    _setDataFingerprintQuery2->reset_and_clear_bindings();
-    _setDataFingerprintQuery2->bindValue(1, dataFingerprint);
-    if (!_setDataFingerprintQuery2->exec()) {
-        qWarning() << "Error SQL statement setDataFingerprint2: "
-                   << _setDataFingerprintQuery2->lastQuery() << " :"
-                   << _setDataFingerprintQuery2->error();
-    }
-}

 void SyncJournalDb::commit(const QString& context, bool startTrans)
 {
@@ -154,12 +154,6 @@ public:
     */
    QByteArray getChecksumType(int checksumTypeId);

-    /**
-     * The data-fingerprint used to detect backup
-     */
-    void setDataFingerprint(const QByteArray &dataFingerprint);
-    QByteArray dataFingerprint();
-
 private:
    bool updateDatabaseStructure();
    bool updateMetadataTableStructure();
@@ -202,9 +196,6 @@ private:
    QScopedPointer<SqlQuery> _getChecksumTypeIdQuery;
    QScopedPointer<SqlQuery> _getChecksumTypeQuery;
    QScopedPointer<SqlQuery> _insertChecksumTypeQuery;
-    QScopedPointer<SqlQuery> _getDataFingerprintQuery;
-    QScopedPointer<SqlQuery> _setDataFingerprintQuery1;
-    QScopedPointer<SqlQuery> _setDataFingerprintQuery2;

    /* This is the list of paths we called avoidReadFromDbOnNextSync on.
     * It means that they should not be written to the DB in any case since doing
@@ -296,6 +296,41 @@ QString Theme::about() const
    return re;
 }

+#ifndef TOKEN_AUTH_ONLY
+QVariant Theme::customMedia( CustomMediaType type )
+{
+    QVariant re;
+    QString key;
+
+    switch ( type )
+    {
+    case oCSetupTop:
+        key = QLatin1String("oCSetupTop");
+        break;
+    case oCSetupSide:
+        key = QLatin1String("oCSetupSide");
+        break;
+    case oCSetupBottom:
+        key = QLatin1String("oCSetupBottom");
+        break;
+    case oCSetupResultTop:
+        key = QLatin1String("oCSetupResultTop");
+        break;
+    }
+
+    QString imgPath = QString::fromLatin1(":/client/theme/colored/%1.png").arg(key);
+    if ( QFile::exists( imgPath ) ) {
+        QPixmap pix( imgPath );
+        if( pix.isNull() ) {
+            // pixmap loading hasn't succeeded. We take the text instead.
+            re.setValue( key );
+        } else {
+            re.setValue( pix );
+        }
+    }
+    return re;
+}
+
 QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const
 {
    // FIXME: Mind the size!
@@ -366,6 +401,7 @@ QPixmap Theme::wizardHeaderBanner() const
    pix.fill(wizardHeaderBackgroundColor());
    return pix;
 }
+#endif

 bool Theme::wizardSelectiveSyncDefaultNothing() const
 {
@@ -37,6 +37,13 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
 {
    Q_OBJECT
 public:
+    enum CustomMediaType {
+        oCSetupTop,      // ownCloud connect page
+        oCSetupSide,
+        oCSetupBottom,
+        oCSetupResultTop // ownCloud connect result page
+    };
+
    /* returns a singleton instance. */
    static Theme* instance();

@@ -148,6 +155,13 @@ public:
    QString systrayIconFlavor(bool mono) const;

 #ifndef TOKEN_AUTH_ONLY
+    /**
+     * Override to use a string or a custom image name.
+     * The default implementation will try to look up
+     * :/client/theme/<type>.png
+     */
+    virtual QVariant customMedia( CustomMediaType type );
+
    /** @return color for the setup wizard */
    virtual QColor wizardHeaderTitleColor() const;

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

 #ifdef Q_OS_UNIX
 #include <sys/statvfs.h>
@@ -427,25 +420,6 @@ bool Utility::isBSD()
 #endif
 }

-QString Utility::platformName()
-{
-    QString re("Windows");
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-    if( isMac() ) {
-        re = QLatin1String("MacOSX");
-    } else if( isLinux() ) {
-        re = QLatin1String("Linux");
-    } else if( isBSD() ) {
-        re = QLatin1String("BSD");
-    } else if( isUnix() ) {
-        re = QLatin1String("Unix");
-    }
-#else
-    re = QSysInfo::prettyProductName();
-#endif
-    return re;
-}

 void Utility::crash()
 {
@@ -572,18 +546,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);
-#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    fileNames.sort(Qt::CaseInsensitive);
-#else
-    fileNames.sort();
-#endif
-}
-
 } // namespace OCC
@@ -91,7 +91,6 @@ namespace Utility
    OWNCLOUDSYNC_EXPORT bool isLinux(); // use with care
    OWNCLOUDSYNC_EXPORT bool isBSD(); // use with care, does not match OS X

-    OWNCLOUDSYNC_EXPORT QString platformName();
    // crash helper for --debug
    OWNCLOUDSYNC_EXPORT void crash();

@@ -137,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

@@ -26,6 +26,7 @@ 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));
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -892,7 +892,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Error en carregar la llista de carpetes del servidor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>S&apos;ha desconnectat</translation>
    </message>
@@ -902,96 +902,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>S&apos;està comprovant els canvis a &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>S&apos;està sincronitzant %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>descarrega %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>pujada %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 pendent, %1 de %2, fitxer %3 de %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>fitxer %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>S&apos;està esperant...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>S&apos;està esperant %n altra carpeta...</numerusform><numerusform>S&apos;està esperant %n altres carpetes</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>S&apos;està preparant per sincronitzar...</translation>
    </message>
@@ -1916,7 +1916,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Error en escriure les metadades a la base de dades</translation>
    </message>
@@ -1954,17 +1954,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>
@@ -2450,18 +2450,18 @@ No és aconsellada usar-la.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>La comp&amp;artició pública requereix una contrasenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Establiu la contrasenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Com&amp;parteix l&apos;enllaç</translation>
    </message>
@@ -2871,12 +2871,12 @@ No és aconsellada usar-la.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2981,64 +2981,64 @@ No és aconsellada usar-la.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>El nom del fitxer conté al menys un caràcter invàlid</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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <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="1284"/>
        <source>the source</source>
        <translation>l&apos;origen</translation>
    </message>
@@ -3068,7 +3068,7 @@ No és aconsellada usar-la.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
@@ -3291,10 +3291,10 @@ No és aconsellada usar-la.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versió %2. Per més informació visiteu &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Per Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz i altres.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;amb llicència GNU General Public License (GPL) versió 2.0&lt;br/&gt;ownCloud i el logo d&apos;ownCloud són marques registrades d&apos;ownCloud, Inc. als Estats Units, altres països, o ambdós.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3505,7 +3505,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -894,7 +894,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
        <translation>Chyba při načítání seznamu adresářů ze serveru.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Odhlášeno</translation>
    </message>
@@ -904,96 +904,96 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
        <translation>Přidání adresáře je vypnuto, protože již synchronizujete všechny své soubory. Pokud chcete synchronizovat pouze některé adresáře, odstraňte aktuálně nastavený kořenový adresář.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Načítání seznamu adresářů ze serveru...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Kontrola změn v &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchronizuji %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>stahování %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>nahrávání %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 ze %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>soubor %1 z %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Chvíli strpení...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Synchronizace se připravuje...</translation>
    </message>
@@ -1918,7 +1918,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Chyba zápisu metadat do databáze</translation>
    </message>
@@ -1956,17 +1956,17 @@ Nedoporučuje se jí používat.</translation>
        <translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="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>
@@ -2452,18 +2452,18 @@ Nedoporučuje se jí používat.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Veřejné s&amp;dílení vyžaduje heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Nastavte prosím heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Sdílet odkaz</translation>
    </message>
@@ -2552,7 +2552,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Ladící zobrazení šifry SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2873,12 +2873,12 @@ Nedoporučuje se jí používat.</translation>
        <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="1139"/>
        <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="1146"/>
        <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>
@@ -2983,64 +2983,64 @@ Nedoporučuje se jí používat.</translation>
        <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="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <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="1283"/>
        <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="1284"/>
        <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="1284"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -3070,8 +3070,8 @@ Nedoporučuje se jí používat.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Nedoporučuje se jí používat.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Verze %2. Pro další informace navštivte &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a další.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licencováno pod GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud a ownCloud logo jsou registrované obchodní známky ownCloud, Inc. ve Spojených státech, ostatních zemích nebo obojí&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Verze %2. Pro další informace navštivte &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a další.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licencováno pod GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud a ownCloud logo jsou registrované obchodní známky ownCloud, Inc. ve Spojených státech, ostatních zemích nebo obojí&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3507,7 +3507,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -3522,7 +3522,7 @@ Nedoporučuje se jí používat.</translation>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
-        <translation><numerusform>před %n dnyëm</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
+        <translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="477"/>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
    </message>
@@ -893,7 +893,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Fehler beim Empfang der Ordnerliste vom Server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Abgemeldet</translation>
    </message>
@@ -903,96 +903,96 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
        <translation>Sie können keinen weiteren Ordner hinzufügen, da Sie bereits alle Dateien synchronisieren. Falls sie mehrere Ordner synchronisieren wollen, entferen Sie zunächst den konfigurierten Wurzel-Ordner.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Empfange Orderliste vom Server...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Nach Änderungen suchen in &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchronisiere %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>Download %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>Upload %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 von %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>Datei %1 von %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Warte...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Bereite Synchronisation vor...</translation>
    </message>
@@ -1916,7 +1916,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Fehler beim Schreiben der Metadaten in die Datenbank</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>
@@ -2450,18 +2450,18 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Öffentliches Teilen erfordert ein P&amp;asswort</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Bitte wählen Sie ein Passwort:</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Link teilen</translation>
    </message>
@@ -2550,7 +2550,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Debug-Ansicht der SSL-Chiffren</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2871,12 +2871,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <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="1139"/>
        <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="1146"/>
        <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>
@@ -2981,64 +2981,64 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <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="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <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="1284"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -3068,8 +3068,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3291,10 +3291,10 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Version %2. Weitere Informationen unter &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und anderen.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Lizensiert unter den Bedingungen der GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud und das ownCloud Logo sind eingetragene Warenzeichen der ownCloud Inc. in den USA, anderen Ländern, oder beidem.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Version %2. Weitere Informationen unter &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und anderen.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Lizensiert unter den Bedingungen der GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud und das ownCloud Logo sind eingetragene Warenzeichen der ownCloud Inc. in den USA, anderen Ländern, oder beidem.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3505,7 +3505,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -68,12 +68,12 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="56"/>
        <source>Lorem ipsum dolor sit amet</source>
-        <translation type="unfinished"/>
+        <translation>Ξεσκεπάζω την ψυχοφθόρα βδελυγμία</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="69"/>
        <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
-        <translation type="unfinished"/>
+        <translation>Ξεσκεπάζω την ψυχοφθόρα βδελυγμία</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -193,7 +193,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
-        <translation type="unfinished"/>
+        <translation>Η έκδοση του διακομιστή %1 είναι παλιά και δεν υποστηρίζεται! Προχωρείστε με δική σας ευθύνη.</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="529"/>
@@ -330,12 +330,12 @@
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="145"/>
        <source>%1 on %2</source>
-        <translation type="unfinished"/>
+        <translation>%1 σε %2</translation>
    </message>
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
        <source>%1 on %2 (disconnected)</source>
-        <translation type="unfinished"/>
+        <translation>%1 σε %2 (αποσυνδεδεμένο)</translation>
    </message>
 </context>
 <context>
@@ -354,7 +354,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="530"/>
        <source>List of ignored or erroneous files</source>
-        <translation type="unfinished"/>
+        <translation>Κατάλογος αρχείων που αγνοούνται ή περιέχουν σφάλματα</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="534"/>
@@ -375,22 +375,22 @@
        <location filename="../src/gui/activitywidget.cpp" line="580"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
-        <translation type="unfinished"/>
+        <translation>Δεν είναι συγχρονισμένα (%1)</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="596"/>
        <source>The server activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Ο κατάλογος δραστηριοτήτων του διακομιστή έχει αντιγραφθεί στο Πρόχειρο</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="600"/>
        <source>The sync activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Ο κατάλογος της δραστηριότητας συγχρονισμού έχει αντιγραφθεί στο Πρόχειρο</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="603"/>
        <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Ο κατάλογος των μη-συγχρονισμένων αρχείων έχει αντιγραφθεί στο Πρόχειρο</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="608"/>
@@ -430,12 +430,12 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="139"/>
        <source>Action Required: Notifications</source>
-        <translation type="unfinished"/>
+        <translation>Απαιτείται ενέργεια: Ειδοποιήσεις</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="144"/>
        <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="351"/>
@@ -522,9 +522,9 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -724,7 +724,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folder.cpp" line="1006"/>
        <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="1008"/>
@@ -860,7 +860,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
        <source>Synchronizing with local folder</source>
-        <translation type="unfinished"/>
+        <translation>Συγχρονισμός με τοπικό φάκελο</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -892,7 +892,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Σφάλμα κατά τη φόρτωση της λίστας φακέλων από το διακομιστή.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Αποσύνδεση</translation>
    </message>
@@ -902,96 +902,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Η επιλογή προσθήκης φακέλου δεν είναι διαθέσιμη καθώς συγχρονίζονται ήδη όλα τα αρχεία. Για να επιλέξετε συγχρονισμό φακέλων, αφαιρέστε τον αρχικό φάκελο που έχει ρυθμιστεί.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Λήψη λίστας φακέλων από το διακομιστή...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Έλεγχος αλλαγών στο &apos;%1&apos;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Συγχρονισμός %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>λήψη %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>μεταφόρτωση %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 από %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>αρχείο %1 από %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Αναμονή...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Αναμονή για %n άλλο φάκελο...</numerusform><numerusform>Αναμονή για %n άλλους φακέλους...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Προετοιμασία για συγχρονισμό...</translation>
    </message>
@@ -1526,7 +1526,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="99"/>
        <source>Closing in a few seconds...</source>
-        <translation type="unfinished"/>
+        <translation>Κλείσιμο σε λίγα δευτερόλεπτα...</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="133"/>
@@ -1916,9 +1916,9 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -1954,19 +1954,19 @@ 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"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -1992,7 +1992,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
        <source>could not delete file %1, error: %2</source>
-        <translation type="unfinished"/>
+        <translation>αδυναμία διαγραφής αρχείου %1, σφάλμα: %2</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -2007,7 +2007,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -2038,7 +2038,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -2064,7 +2064,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -2092,7 +2092,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -2141,7 +2141,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="800"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
    </message>
 </context>
 <context>
@@ -2184,7 +2184,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
-        <translation type="unfinished"/>
+        <translation>Πρωτόκολλο τοπικού συγχρονισμού</translation>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
@@ -2279,7 +2279,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/selectivesyncdialog.cpp" line="247"/>
        <source>An error occurred while loading the list of sub folders.</source>
-        <translation type="unfinished"/>
+        <translation>Παρουσιάστηκε σφάλμα κατά την φόρτωση της λίστας των υπο-φακέλων</translation>
    </message>
 </context>
 <context>
@@ -2378,7 +2378,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="101"/>
        <source>The server does not allow sharing</source>
-        <translation type="unfinished"/>
+        <translation>Ο διακομιστής δεν επιτρέπει τον διαμοιρασμό</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="113"/>
@@ -2450,18 +2450,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Ο δημόσιος &amp;διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Παρακαλούμε ορίστε Κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Δ&amp;ιαμοιρασμός συνδέσμου</translation>
    </message>
@@ -2481,7 +2481,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="224"/>
        <source>No results for &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Κανένα αποτέλεσμα για &apos;%1&apos;</translation>
    </message>
 </context>
 <context>
@@ -2862,7 +2862,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
+        <translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="701"/>
@@ -2871,12 +2871,12 @@ It is not advisable to use it.</source>
        <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
    </message>
@@ -2928,7 +2928,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="188"/>
        <source>Access is forbidden</source>
-        <translation type="unfinished"/>
+        <translation>Δεν επιτρέπεται η πρόσβαση</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="199"/>
@@ -2978,67 +2978,67 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="754"/>
        <source>Unable to read the blacklist from the local database</source>
-        <translation type="unfinished"/>
+        <translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -3048,7 +3048,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/synclogdialog.ui" line="14"/>
        <source>Synchronisation Log</source>
-        <translation type="unfinished"/>
+        <translation>Ιστορικό συγχρονισμού</translation>
    </message>
 </context>
 <context>
@@ -3068,8 +3068,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Πνευματικά δικαιώματα ownCloud, Ανώνυμη Εταιρία&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3195,7 +3195,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="236"/>
        <source>Unsupported Server Version</source>
-        <translation type="unfinished"/>
+        <translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="237"/>
@@ -3215,37 +3215,37 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="296"/>
        <source>Account synchronization is disabled</source>
-        <translation type="unfinished"/>
+        <translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="379"/>
        <source>Unpause all folders</source>
-        <translation type="unfinished"/>
+        <translation>Αναίρεση παύσης όλων των φακέλων</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="384"/>
        <source>Pause all folders</source>
-        <translation type="unfinished"/>
+        <translation>Παύση όλων των φακέλων</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="515"/>
        <source>Unpause all synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Αναίρεση παύσης όλων των συγχρονισμών</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="517"/>
        <source>Unpause synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Αναίρεση παύσης συγχρονσμού</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="525"/>
        <source>Pause all synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Παύση όλων των συγχρονισμών</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="527"/>
        <source>Pause synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Παύση συγχρονισμού</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="534"/>
@@ -3291,10 +3291,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Έκδοση %2. Για περισσότερες πληροφορίες επισκεφθείτε &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Των Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz και άλλων.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Πνευματικά δικαιώματα ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Αδειοδότηση υπό την GNU General Public License (GPL) Έκδοση 2.0&lt;br/&gt;το ownCloud και το λογότυπο ownCloud είναι σήματα κατατεθέντα της ownCloud, Inc. στις Η.Π.Α., σε άλλες χώρες ή και στα δύο&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3505,9 +3505,9 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
-        <translation type="unfinished"/>
+        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
 </context>
 <context>
@@ -3515,7 +3515,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>στο μέλλον</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="469"/>
@@ -3530,12 +3530,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
-        <translation type="unfinished"/>
+        <translation>τώρα</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
-        <translation type="unfinished"/>
+        <translation>Λιγότερο από ένα λεπτό πριν</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="487"/>
@@ -3573,7 +3573,7 @@ It is not advisable to use it.</source>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
        <source>%n year(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n χρόνος</numerusform><numerusform>%n χρόνια</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="320"/>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
    <name>FileSystem</name>
    <message>
@@ -530,7 +530,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"></translation>
    </message>
@@ -918,7 +918,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation type="unfinished"></translation>
    </message>
@@ -928,91 +928,91 @@ 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/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing &apos;foo.txt&apos;, &apos;bar.txt&apos;&quot;</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation type="unfinished"></translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished">
            <numerusform></numerusform>
@@ -1020,7 +1020,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1937,7 +1937,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</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>
@@ -2471,18 +2471,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2890,12 +2890,12 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3000,64 +3000,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <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="1284"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -3087,7 +3087,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@@ -3310,9 +3310,9 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -3524,7 +3524,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -894,7 +894,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
        <translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Cerrar sesión</translation>
    </message>
@@ -904,96 +904,96 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
        <translation>Añadir carpetas está deshabilitado debido a que ya están sincronizándose todos sus archivos. Si desea sincronizar múltiples carpeta, elimine la carpeta raíz actualmente configurada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Obtención de lista de carpetas del servidor...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Buscando cambios en &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sincronizando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>descargando: %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>cargar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 restantes, %1 de %2, archivo %3 de %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>archivo %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Esperando...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Preparando para sincronizar...</translation>
    </message>
@@ -1917,7 +1917,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -1955,17 +1955,17 @@ No se recomienda usarla.</translation>
        <translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>El archivo ha cambiado desde que fue descubierto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Error al escribir los metadatos en la base de datos</translation>
    </message>
@@ -2451,18 +2451,18 @@ No se recomienda usarla.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Compartir public&amp;amente requiere contraseña</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Por favor establece una contraseña</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Compartir enlace</translation>
    </message>
@@ -2551,7 +2551,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Vista depuradador Chipher SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2872,12 +2872,12 @@ No se recomienda usarla.</translation>
        <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="1139"/>
        <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="1146"/>
        <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>
@@ -2982,64 +2982,64 @@ No se recomienda usarla.</translation>
        <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="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -3069,8 +3069,8 @@ No se recomienda usarla.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, incorporado&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3292,10 +3292,10 @@ No se recomienda usarla.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versión %2. Para más información, visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Creado por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Está bajo la Licencia General Pública (GPL, en inglés) GNU Versión 2.0&lt;br/&gt;ownCloud y el logo de ownCloud son marcas registradas de ownCloud, Inc. en los Estados Unidos, otros países, o ambos.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Version %2. Para más información visita &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3506,7 +3506,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Desautentificado</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sincronizando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>Cargado %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>Archivo %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Esperando...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Preparando para sincronizar...</translation>
    </message>
@@ -1905,7 +1905,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</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>
@@ -2439,18 +2439,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2858,12 +2858,12 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2968,64 +2968,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -3055,7 +3055,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
@@ -3278,9 +3278,9 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
@@ -3493,7 +3493,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Välja logitud</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Kontrollitakse muudatusi kaustas &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sünkroniseerimine %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>allalaadimine %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>üleslaadimine %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 / %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>fail %1 / %2-st</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Ootamine...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Sünkroniseerimiseks valmistumine...</translation>
    </message>
@@ -1906,7 +1906,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</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>
@@ -2440,18 +2440,18 @@ Selle kasutamine pole soovitatav.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Avalik j&amp;agamine nõuab parooli</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Palun määra parool</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaga linki</translation>
    </message>
@@ -2861,12 +2861,12 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2971,64 +2971,64 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -3058,7 +3058,7 @@ Selle kasutamine pole soovitatav.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
@@ -3281,9 +3281,9 @@ Selle kasutamine pole soovitatav.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
@@ -3495,7 +3495,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Errorea zerbitzaritik karpeten zerrenda eskuratzean.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Saioa bukatuta</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Zerbitzaritik karpeta zerrenda eskuratzen...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>%1 Sinkronizatzen</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>Deskargatu %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>igo %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%4 - %3tik)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>%1. fitxategia %2tik</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Itxoiten...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Itxoiten beste karpeta %n...</numerusform><numerusform>Itxoiten beste %n karpeta...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Sinkronizatzeko prestatzen...</translation>
    </message>
@@ -1912,7 +1912,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1950,17 +1950,17 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2446,18 +2446,18 @@ Ez da gomendagarria erabltzea.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Mesedez Ezarri Pasahitza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2865,12 +2865,12 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2975,64 +2975,64 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -3062,7 +3062,7 @@ Ez da gomendagarria erabltzea.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
@@ -3285,10 +3285,10 @@ Ez da gomendagarria erabltzea.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%2 Bertsioa. Informazio gehiago eskuratzeko ikusi &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Egileak: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz eta bestea batzuk.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;GNU General Public License (GPL) 2.0 bertsioaren lizentziapean banatuta.&lt;br/&gt;ownCloud eta ownCloud-en Logoa ownCloud, Inc. enpresaren marka erregistratuak dira Estatu Batuetan, beste herrialdeetan edo bietan.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3499,7 +3499,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>خارج شد</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>همگام‌سازی %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>رشته های ترجمه نشده</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>دانلود %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>آپلود %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 از %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>فایل %1 از %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>درحال انتظار...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>در انتظار برای %n پوشه‌‎ی دیگر ...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>آماده‌سازی همگام‌سازی ...</translation>
    </message>
@@ -1905,7 +1905,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</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>
@@ -2439,18 +2439,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>لطفا رمزعبور را تعیین کنید</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;اشتراک‌گذاری لینک</translation>
    </message>
@@ -2858,12 +2858,12 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2968,64 +2968,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>مقصد</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>مبدا</translation>
    </message>
@@ -3055,7 +3055,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
@@ -3278,9 +3278,9 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
@@ -3492,7 +3492,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
    </message>
@@ -890,7 +890,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Virhe ladatessa kansiolistausta palvelimelta.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Kirjauduttu ulos</translation>
    </message>
@@ -900,96 +900,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Kansion lisääminen on poistettu käytöstä, koska synkronoit jo kaikki tiedostot. Jos haluat synkronoida useita kansioita, poista nykyisen juurikansion synkronointiyhteys.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Haetaan kansioluetteloa palvelimelta...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synkronoidaan %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3/%4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>tiedosto %1/%2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Odotetaan...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Odotetaan %n muuta kansiota...</numerusform><numerusform>Odotetaan %n muuta kansiota...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Valmistaudutaan synkronointiin...</translation>
    </message>
@@ -1913,7 +1913,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Virhe kirjoittaessa metadataa tietokantaan</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>
@@ -2447,18 +2447,18 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>&amp;Julkinen jakaminen vaatii salasanan</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Aseta salasana</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaa linkki</translation>
    </message>
@@ -2868,12 +2868,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <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="1139"/>
        <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="1146"/>
        <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>
@@ -2978,64 +2978,64 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -3065,8 +3065,8 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Tekijänoikeus ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3288,10 +3288,10 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versio %2. Lisätietoja osoitteessa &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Tehnyt Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ja muut.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Tekijänoikeus ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Lisensoitu GNU General Public License (GPL), versio 2.0 -lisenssillä&lt;br/&gt;ownCloud ja ownCloudin logo ovat ownCloud, Incin rekisteröimiä tavaramerkkejä Yhdysvalloissa ja muissa maissa.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3502,7 +3502,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -894,7 +894,7 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
        <translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Session fermée</translation>
    </message>
@@ -904,96 +904,96 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
        <translation>L&apos;ajout de dossier est désactivé car vous synchronisez déjà tous vos fichiers. Si vous voulez synchroniser plusieurs dossiers, supprimez d&apos;abord le dossier racine configuré actuellement.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Récupération de la liste des dossiers depuis le serveur...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Recherche de modifications dans &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchronisation de %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>réception %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>envoi %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 restant, %1 sur %2, fichier %3 sur %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>fichier %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>En attente ...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Préparation à la synchronisation</translation>
    </message>
@@ -1918,7 +1918,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -1956,17 +1956,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Le fichier téléchargé est vide malgré que le serveur a annoncé qu&apos;il aurait dû être %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Le fichier a changé depuis sa découverte</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
    </message>
@@ -2452,18 +2452,18 @@ Il est déconseillé de l&apos;utiliser.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Le p&amp;artage public nécessite un mot de passe</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Veuillez choisir un mot de passe</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Partager par &amp;lien public</translation>
    </message>
@@ -2552,7 +2552,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Vue de débug Chipher SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2873,12 +2873,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter un dossier parent</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
    </message>
@@ -2983,64 +2983,64 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Impossible de lire la liste noire de la base de données locale</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Impossible de lire le journal de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossible d&apos;ouvrir le journal de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Le nom de fichier contient au moins un caractère non valable</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignoré à cause de la liste noire &quot;Choisir le contenu à synchroniser&quot;.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Fichiers locaux et répertoire de partage supprimés.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Déplacement non autorisé, élément restauré</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -3070,8 +3070,8 @@ Il est déconseillé de l&apos;utiliser.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Il est déconseillé de l&apos;utiliser.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Version %2. Pour plus d&apos;informations, consultez &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3507,7 +3507,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -890,7 +890,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Desconectado</translation>
    </message>
@@ -900,96 +900,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sincronizando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>descargar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>enviar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>ficheiro %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation type="unfinished"/>
    </message>
@@ -1912,7 +1912,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1950,17 +1950,17 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro cambiou após seren atopado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2446,18 +2446,18 @@ Recomendámoslle que non o use.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>A comp&amp;artición pública precisa de contrasinal </translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Estabeleza o contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Ligazón para compartir</translation>
    </message>
@@ -2867,12 +2867,12 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2977,64 +2977,64 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Non foi posíbel abrir o rexistro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome de ficheiro contén algún carácter incorrecto</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <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="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -3064,8 +3064,8 @@ Recomendámoslle que non o use.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3287,10 +3287,10 @@ Recomendámoslle que non o use.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versión %2. Para obter máis información visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licenciado baixo a Licenza Publica Xeral (GPL) GNU Version 2.0&lt;br/&gt;ownCloud e o logotipo ownCloud son marcas rexistradas da ownCloud, Inc. nos EE.UU de Norte América, noutros países ou en ambos.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3501,7 +3501,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu_HU" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu_HU" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Kijelentkezve</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>%1 szinkronizálása</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>letöltés: %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>feltöltés: %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 / %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 maradt, %1 / %2, %3 / %4 fájl</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>%1 / %2 fájl</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Várakozás...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Várakozás %n további könyvtárra...</numerusform><numerusform>Várakozás %n további könyvtárra...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Felkészülés szinkronizálásra...</translation>
    </message>
@@ -1909,7 +1909,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1947,17 +1947,17 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -2443,18 +2443,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Nyilvános me&amp;gosztáshoz szükség van jelszóra</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Kérjük, állíts be egy jelszót</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Hivatkozás &amp;megosztása</translation>
    </message>
@@ -2863,12 +2863,12 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2973,64 +2973,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>a cél</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>a forrás</translation>
    </message>
@@ -3060,8 +3060,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Szerzői jog: ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3283,10 +3283,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Verzió: %2. Bővebb információért látogass el ide: &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Készítők: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz és még mások.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Minden jog fenntartva. ownCloud, Inc.&lt;/p&gt;&lt;p&gt;A GNU General Public License (GPL) 2.0-ás verziója alatt licencelve&lt;br/&gt;A ownCloud és a ownCloud logó a ownCloud, Inc. bejegyzett védjegye az Egyesült Államokban és más országokban.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3497,7 +3497,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -894,7 +894,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
        <translation>Errore durante il caricamento dell&apos;elenco delle cartelle dal server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Disconnesso</translation>
    </message>
@@ -904,96 +904,96 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
        <translation>L&apos;aggiunta di una cartella è disabilitata perché stai già sincronizzando tutti i tuoi file. Se desideri sincronizzare più cartelle, rimuovi la cartella radice attualmente configurata.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Recupero dell&apos;elenco delle cartelle dal server...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Controllo delle modifiche in &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sincronizzazione di %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>ricezione %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>invio %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 di %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 rimanenti, %1 di %2, file %3 di %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>file %1 di %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Attendere...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Preparazione della sincronizzazione...</translation>
    </message>
@@ -1917,7 +1917,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -1955,17 +1955,17 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Il file è stato modificato dal suo rilevamento</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Errore durante la scrittura dei metadati nel database</translation>
    </message>
@@ -2451,18 +2451,18 @@ Non è consigliabile utilizzarlo.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>La condivisione pubblic&amp;a richiede una password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>imposta la password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Condividi colle&amp;gamento</translation>
    </message>
@@ -2551,7 +2551,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Vista debug cifrario SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2872,12 +2872,12 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
    </message>
@@ -2982,64 +2982,64 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Impossibile leggere la lista nera dal database locale</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Impossibile leggere dal registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Il nome del file contiene almeno un carattere non valido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -3069,8 +3069,8 @@ Non è consigliabile utilizzarlo.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3292,10 +3292,10 @@ Non è consigliabile utilizzarlo.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versione %2. Per ulteriori informazioni, visita &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Sotto licenza GNU General Public License (GPL) versione 2.0&lt;br/&gt;ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi o entrambi&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Versione %2. Per ulteriori informazioni, visita &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Sotto licenza GNU General Public License (GPL) versione 2.0&lt;br/&gt;ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi o entrambi.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3506,7 +3506,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -834,12 +834,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderman.cpp" line="1214"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダを含んでいます。他のフォルダーを選択してください。</translation>
+        <translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダーを含んでいます。他のフォルダーを選択してください。</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1221"/>
        <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>ローカルフォルダー %1 はシンボリックリンクです。リンク先のフォルダにはすでに同期フォルダーとして利用されているフォルダーを含みます。他のフォルダーを選択してください。</translation>
+        <translation>ローカルフォルダー %1 はシンボリックリンクです。リンク先のフォルダーにはすでに同期フォルダーとして利用されているフォルダーを含みます。他のフォルダーを選択してください。</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1228"/>
@@ -894,106 +894,106 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>サーバーからフォルダーのリスト取得時にエラー</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>サインアウト</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
        <source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
-        <translation>既に同期対象のフォルダーのため、追加したフォルダーを無効にしました。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダーの同期設定を削除してください。</translation>
+        <translation>すでに同期対象のフォルダーのため、追加したフォルダーを無効にしました。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダーの同期設定を削除してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
-        <translation>サーバーからフォルダリストを取得中...</translation>
+        <translation>サーバーからフォルダーリストを取得中...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>&apos;%1&apos; の更新を確認しています</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>同期中 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>ダウンロード %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>アップロード %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%4 中 %3 完了)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
-        <translation>残り %5分、%2中 %1完了 、%4中 %3 ファイル完了</translation>
+        <translation>残り %5、%2中 %1完了 、%4中 %3 ファイル完了</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>%1 / %2 ファイル</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>待機中...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>同期の準備中...</translation>
    </message>
@@ -1916,7 +1916,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -1954,17 +1954,17 @@ It is not advisable to use it.</source>
        <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>ファイルは発見以降に変更されました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>メタデータのデータベースへの書き込みに失敗</translation>
    </message>
@@ -1992,7 +1992,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
        <source>could not delete file %1, error: %2</source>
-        <translation>ファイル %1 を削除出来ませんでした,エラー : %2</translation>
+        <translation>ファイル %1 を削除できません。エラー: %2</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -2002,7 +2002,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
        <source>could not create folder %1</source>
-        <translation>フォルダー %1 を作成できませんでした</translation>
+        <translation>フォルダー %1 を作成できません</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
@@ -2020,7 +2020,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
        <source>Could not remove folder &apos;%1&apos;</source>
-        <translation>フォルダ &apos;%1&apos;を削除できません</translation>
+        <translation>フォルダー &apos;%1&apos;を削除できません</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -2217,7 +2217,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/proxyauthdialog.ui" line="43"/>
        <source>The proxy server needs a username and password.</source>
-        <translation>プロキシサーバーにユーザー名とパスワードが必要です。</translation>
+        <translation>プロキシサーバーにはユーザー名とパスワードが必要です。</translation>
    </message>
    <message>
        <location filename="../src/gui/proxyauthdialog.ui" line="50"/>
@@ -2450,18 +2450,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>共有するにはパスワードが必要(&amp;A)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>パスワードを入力してください</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>リンク共有(&amp;S)</translation>
    </message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>SSL暗号デバッグ表示</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2862,7 +2862,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="440"/>
        <source>File/Folder is ignored because it&apos;s hidden.</source>
-        <translation>隠しファイル/フォルダのため無視されました</translation>
+        <translation>隠しファイル/フォルダーのため無視されました</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="701"/>
@@ -2871,12 +2871,12 @@ It is not advisable to use it.</source>
        <translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>そのフォルダーにファイルを追加する権限がありません</translation>
    </message>
@@ -2981,64 +2981,64 @@ It is not advisable to use it.</source>
        <translation>ローカルデータベースからブラックリストを読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>同期ジャーナルから読み込みできません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <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="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -3068,8 +3068,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3220,12 +3220,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="379"/>
        <source>Unpause all folders</source>
-        <translation>すべてのフォルダの同期を再開</translation>
+        <translation>すべてのフォルダーの同期を再開</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="384"/>
        <source>Pause all folders</source>
-        <translation>すべてのフォルダの同期を一時停止</translation>
+        <translation>すべてのフォルダーの同期を一時停止</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="515"/>
@@ -3291,10 +3291,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;バージョン %2 詳細については、&lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;をご覧ください。By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;br/&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;著作権 ownCloud, Inc.&lt;p&gt;&lt;p&gt;%4 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。&lt;br&gt;ownCloud 及び ownCloud のロゴはアメリカ合衆国またはその他の国、あるいはその両方における&lt;br&gt; ownCloud, Inc.の登録商標です。&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3505,7 +3505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -894,7 +894,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
        <translation>Feil ved innlasting av listen av mapper fra serveren.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Logget ut</translation>
    </message>
@@ -904,96 +904,96 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
        <translation>Du kan ikke legge til en mappe fordi du allerede synkroniserer alle filene dine. Hvis du ønsker å synkronisere individuelle mapper, må du fjerne synkroniseringen av rotmappen som er konfigurert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Henter mappeliste fra server..</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Ser etter endringer i &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synkroniserer %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>nedlasting %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>opplasting %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 av %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 igjen, %1 av %2, fil %3 of %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>fil %1 av %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Venter..</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Venter på %n annen mappe...</numerusform><numerusform>Venter på %n andre mappe(r)...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Forbereder synkronisering...</translation>
    </message>
@@ -1918,7 +1918,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -1956,17 +1956,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Filen er endret siden den ble oppdaget</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Feil ved skriving av metadata til databasen</translation>
    </message>
@@ -2452,18 +2452,18 @@ Det er ikke tilrådelig å bruke den.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Offentlig d&amp;eling krever et passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Sett passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Del lenke</translation>
    </message>
@@ -2873,12 +2873,12 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
    </message>
@@ -2983,64 +2983,64 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Kan ikke lese fra synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan ikke åpne synkroniseringsjournalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorert på grunn av svartelisten &quot;velg hva som skal synkroniseres&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ikke tillatt å fjerne, gjenoppretter</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale filer og delingsmappe fjernet.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Flytting ikke tillatt, element gjenopprettet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>målet</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>kilden</translation>
    </message>
@@ -3070,8 +3070,8 @@ Det er ikke tilrådelig å bruke den.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Det er ikke tilrådelig å bruke den.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versjon %2. For mer informasjon gå til &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz med flere.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Lisensiert under GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud og ownCloud-logo er registrerte varemerker for ownCloud, Inc. i USA, andre land, eller begge deler.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3507,7 +3507,7 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>LTR</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -895,7 +895,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
        <translation>Fout bij ophalen mappenlijst van de server.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Afgemeld</translation>
    </message>
@@ -905,96 +905,96 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
        <translation>Het toevoegen van een map is uitgeschakeld, omdat u reeds al uw bestanden synchroniseert. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde hoofdmap verwijderen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Mappenlijst ophalen van de server...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Controleren op wijzigingen in &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchroniseren %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>download %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>upload %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 van %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 over, %1 van %2, bestand %3 van %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>bestand %1 van %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Aan het wachten...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Voorbereiden op sync...</translation>
    </message>
@@ -1919,7 +1919,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -1957,17 +1957,17 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Fout bij schrijven van Metadata naar de database</translation>
    </message>
@@ -2453,18 +2453,18 @@ We adviseren deze site niet te gebruiken.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Openbaar de&amp;len vereist een wachtwoord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Stel uw wachtwoord in</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Deel link</translation>
    </message>
@@ -2553,7 +2553,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>SSL Cipher Debug View</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2874,12 +2874,12 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
    </message>
@@ -2984,64 +2984,64 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Kan de blacklist niet lezen uit de lokale database</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; zwarte lijst</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan om te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale bestanden en share-map verwijderd. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -3071,8 +3071,8 @@ We adviseren deze site niet te gebruiken.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3294,10 +3294,10 @@ We adviseren deze site niet te gebruiken.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versie %2. Bezoek voor meer informatie bezoek &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;&lt;small&gt;Door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz en anderen.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Gelicenseerd onder de GNU Genertal Public License (GPL) Versie 2.0&lt;br&gt;ownCloud en het ownCloud logo zijn geregistreerde handelsmerken van ownCloud, Inc. in de Verenigde Staten, andere landen, of beide.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Versie %2. Bezoek voor meer informatie bezoek &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;&lt;small&gt;Door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz en anderen.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, GmbH&lt;/p&gt;&lt;p&gt;Gelicenseerd onder de GNU General Public License (GPL) Versie 2.0&lt;br&gt;ownCloud en het ownCloud logo zijn geregistreerde handelsmerken van ownCloud, Inc. in de Verenigde Staten, andere landen, of beide.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3508,7 +3508,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -844,7 +844,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
    <message>
        <location filename="../src/gui/folderman.cpp" line="1228"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1234"/>
@@ -894,7 +894,7 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
        <translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Odłączony</translation>
    </message>
@@ -904,96 +904,96 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
        <translation>Dodawanie folderu jest zablokowane, ponieważ już synchronizujesz wszystkie swoje pliki. Jeśli chcesz zsynchronizować wiele folderów, usuń folder aktualnie skonfigurowany.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Pobieranie listy folderów z serwera.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Sprawdzanie zmian na &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchronizowanie %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>pobieranie %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>wysyłanie %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 z %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>plik %1 z %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Czekaj...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Przygotowanie do synchronizacji ...</translation>
    </message>
@@ -1918,7 +1918,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -1956,17 +1956,17 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Błąd podczas zapisu metadanych do bazy</translation>
    </message>
@@ -2452,18 +2452,18 @@ Niezalecane jest jego użycie.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Proszę podać hasło</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2873,12 +2873,12 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
    </message>
@@ -2983,64 +2983,64 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Nie można czytać z dziennika synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <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="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokalne pliki i udostępniane foldery zostały usunięte.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -3070,8 +3070,8 @@ Niezalecane jest jego użycie.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Niezalecane jest jego użycie.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wersja%2. Aby uzyskać więcej informacji prosimy odwiedzić &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3508,7 +3508,7 @@ Kliknij</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Erro ao gravar os metadados para a base de dados</translation>
    </message>
@@ -894,7 +894,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
        <translation>Erro durante o carregamento da lista de pastas a partir do servidor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Sessão terminada</translation>
    </message>
@@ -904,96 +904,96 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
        <translation>Adicionar pasta está desativada porque já está a sincronizar todos os seus ficheiros. Se deseja sincronizar múltiplas pastas, por favor, remova a pasta raiz atualmente configurada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>A obter a lista de pastas do servidor...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>A procurar por alterações em &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>A sincronizar %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>transferir %s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>enviar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>ficheiro %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>A aguardar...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>A aguardar por %n outra pasta...</numerusform><numerusform>A aguardar por %n outra(s) pasta(s)...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>A preparar para sincronizar...</translation>
    </message>
@@ -1918,7 +1918,7 @@ Não é aconselhada a sua utilização.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Erro ao escrever a meta-informação par a base de dados</translation>
    </message>
@@ -1956,17 +1956,17 @@ Não é aconselhada a sua utilização.</translation>
        <translation>O ficheiro transferido está vazio, apesar do servidor indicar que este deveria ter %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro alterou-se desde a sua descoberta</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>Erro ao escrever a meta-informação par a base de dados</translation>
    </message>
@@ -2452,18 +2452,18 @@ Não é aconselhada a sua utilização.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>A pa&amp;rtilha pública requer uma palavra-passe:</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Compartilhe a hiperligação </translation>
    </message>
@@ -2873,12 +2873,12 @@ Não é aconselhada a sua utilização.</translation>
        <translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Não permitido, porque não tem permissão para adicionar a pasta fonte</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation>
    </message>
@@ -2983,64 +2983,64 @@ Não é aconselhada a sua utilização.</translation>
        <translation>Não foi possível ler a lista negra a partir da base de dados local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Não foi possível ler a partir do jornal de sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossível abrir o jornal de sincronismo</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome de ficheiro contém pelo menos um caráter invá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="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado devido à blacklist de escolha para sincronização</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Não permitido, porque não tem permissão para adicionar as subpastas nessa pasta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não autorizado para remoção, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Ficheiros locais e pasta partilhada removidos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Mover não foi permitido, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mover não foi autorizado porque %1 é só de leitura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>a origem</translation>
    </message>
@@ -3070,8 +3070,8 @@ Não é aconselhada a sua utilização.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporado&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Não é aconselhada a sua utilização.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versão %2. Para mais informação visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licenciado sob a GNU General Public License (GPL) Versão 2.0&lt;br/&gt;ownCloud e o logótipo ownCloud são marcas registadas de ownCloud, Inc. nos Estados Unidos da América, outros países, ou ambos.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3507,7 +3507,7 @@ Não é aconselhada a sua utilização.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -894,7 +894,7 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
        <translation>Erro enquanto carregava a lista de pastas do servidor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Desconectado</translation>
    </message>
@@ -904,96 +904,96 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
        <translation>Adição de pasta está desativado porque você já está sincronizando todos os seus arquivos. Se você deseja sincronizar várias pastas, por favor, remova a pasta raiz configurada atualmente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Obtendo lista de pastas do servidor...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Verificando alterações em &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Sincronizando %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>,</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>baixar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>enviar %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 de %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 restando, %1 de %2, arquivo %3 de %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>arquivo %1 de %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Esperando...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Esperando por %n outra pasta...</numerusform><numerusform>Esperando por %n outras pastas...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Preparando para sincronizar...</translation>
    </message>
@@ -1917,7 +1917,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -1955,17 +1955,17 @@ It is not advisable to use it.</source>
        <translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Arquivo foi alterado desde a descoberta</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>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
    </message>
@@ -2451,18 +2451,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Comp&amp;artilhamento público requer uma senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Link de &amp;Compartilhamento</translation>
    </message>
@@ -2551,7 +2551,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Ver depuração da criptografia SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2872,12 +2872,12 @@ It is not advisable to use it.</source>
        <translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
    </message>
@@ -2982,64 +2982,64 @@ It is not advisable to use it.</source>
        <translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Não é possível ler a partir do relatório de sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Não é possível abrir o arquivo de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>O nome do arquivo contem pelo menos um caractere inválido  </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1091"/>
        <location filename="../src/libsync/syncengine.cpp" line="1098"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1176"/>
-        <location filename="../src/libsync/syncengine.cpp" line="1196"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não é permitido remover, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Arquivos locais e pasta compartilhada removida.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Não é permitido mover, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Não é permitido mover porque %1 é somente para leitura</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>a fonte</translation>
    </message>
@@ -3069,8 +3069,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Direitos autorais ownCloud GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3292,10 +3292,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versão %2. Para mais informações visite&lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licenciado sob a GNU General Public License (GPL) Versão 2.0&lt;br/&gt;ownCloud e o logotipo ownCloud são marcas registradas da ownCloud, Inc. nos Estados Unidos, outros países, ou ambos.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Versão %2. Para mais informações visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Direitos autorais ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licenciado sob a GNU General Public License (GPL) Versão 2.0&lt;br/&gt;ownCloud e o logo ownCloud são marcas registradas da  ownCloud, Inc. nos Estados Unidos e, em outros países, ou ambos.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -3506,7 +3506,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Ошибка записи метаданных в базу данных</translation>
    </message>
@@ -894,7 +894,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Ошибка загрузки списка папок с сервера.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Вышли из аккаунта</translation>
    </message>
@@ -904,96 +904,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>Добавление папки отключена, потому что вы уже синхронизированы все файлы. Если вы хотите синхронизировать несколько папок, пожалуйста, удалите текущую корневую папку.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Извлечение списка папок с сервера...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Проверка изменений в &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Синхронизация %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>,</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>скачать %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>выгрузка %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 из %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>Осталось %5, %1 из %2, файл %3 из %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>файл %1 из %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Ожидание...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Ожидание %n папки...</numerusform><numerusform>Ожидание %s папок...</numerusform><numerusform>Ожидание %s папок...</numerusform><numerusform>Ожидание %s папок...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Подготовка к синхронизации...</translation>
    </message>
@@ -1917,7 +1917,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Ошибка записи метаданных в базу данных</translation>
    </message>
@@ -1955,17 +1955,17 @@ It is not advisable to use it.</source>
        <translation>Скачанный файл пуст, хотя сервер заявил, что он должен быть %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>После обнаружения файл был изменен</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>Ошибка записи метаданных в базу данных</translation>
    </message>
@@ -2451,18 +2451,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Публичные ссылки требуют пароля</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Пожалуйста, установите пароль</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Поделиться ссылкой</translation>
    </message>
@@ -2551,7 +2551,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Отладочный просмотр шифра SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2872,12 +2872,12 @@ It is not advisable to use it.</source>
        <translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation>
    </message>
@@ -2982,64 +2982,64 @@ It is not advisable to use it.</source>
        <translation>Не удалось прочитать файл чёрного списка из локальной базы данных.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Не удалось прочитать из журнала синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>назначение</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>источник</translation>
    </message>
@@ -3069,8 +3069,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Все права принадлежат ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3292,10 +3292,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Версия %2. Для более подробной информации посетите &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz и другие.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Права принадлежат ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Под лицензией GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud и логотип ownCloud являются зарегистрированными товарными знаками ownCloud, Inc. в США и других странах.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3506,7 +3506,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -68,12 +68,12 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="56"/>
        <source>Lorem ipsum dolor sit amet</source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="69"/>
        <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
-        <translation type="unfinished"/>
+        <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -183,7 +183,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="501"/>
        <source>%1 in use</source>
-        <translation type="unfinished"/>
+        <translation>%1 sa používa</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="521"/>
@@ -193,7 +193,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="527"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
-        <translation type="unfinished"/>
+        <translation>Verzia servera %1 je stará a nepodporovaná. Pokračujte na vlastné nebezpečenstvo.</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="529"/>
@@ -330,12 +330,12 @@
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="145"/>
        <source>%1 on %2</source>
-        <translation type="unfinished"/>
+        <translation>%1 na %2</translation>
    </message>
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
        <source>%1 on %2 (disconnected)</source>
-        <translation type="unfinished"/>
+        <translation>%1 na %2 (odpojené)</translation>
    </message>
 </context>
 <context>
@@ -344,7 +344,7 @@
        <location filename="../src/gui/activitywidget.cpp" line="516"/>
        <location filename="../src/gui/activitywidget.cpp" line="571"/>
        <source>Server Activity</source>
-        <translation type="unfinished"/>
+        <translation>Aktivita servera</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="522"/>
@@ -354,7 +354,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="530"/>
        <source>List of ignored or erroneous files</source>
-        <translation type="unfinished"/>
+        <translation>Zoznam ignorovaných alebo chybných súborov</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="534"/>
@@ -375,22 +375,22 @@
        <location filename="../src/gui/activitywidget.cpp" line="580"/>
        <source>Not Synced (%1)</source>
        <extracomment>%1 is the number of not synced files.</extracomment>
-        <translation type="unfinished"/>
+        <translation>Nezosynchronizované (%1)</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="596"/>
        <source>The server activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Zoznam aktivít servera bol skopírovaný do schránky.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="600"/>
        <source>The sync activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Zoznam aktivít synchronizácie bol skopírovaný do schránky.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="603"/>
        <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Zoznam nesynchronizovaných položiek bol skopírovaný do schránky.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="608"/>
@@ -415,7 +415,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="135"/>
        <source>Server Activities</source>
-        <translation type="unfinished"/>
+        <translation>Aktivita servera</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="90"/>
@@ -430,12 +430,12 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="139"/>
        <source>Action Required: Notifications</source>
-        <translation type="unfinished"/>
+        <translation>Požaduje sa činnosť: oznámenia</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="144"/>
        <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;Účet %1 nemá zapnuté aktivity.</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="351"/>
@@ -522,9 +522,9 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -719,7 +719,9 @@ Ste si istý, že chcete pokračovať?</translation>
        <source>This sync would reset the files to an erlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>Táto synchronizácia by vrátila súbory v synchronizačnom priečinku „%1“ na starší čas.
+To sa môže stať v prípade, že na vašom serveri bola obnovená záloha.
+Ak by ste normálne pokračovali v synchronizácii, skôzobilo by to prepísanie všetkých vašich súborov ich staršou verziou. Chcete zachovať vaše lokálne, najnovšie súbory ako konfliktné súbory?</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="1006"/>
@@ -734,7 +736,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folder.cpp" line="1009"/>
        <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Ponechať lokálne súbory ako konfliktné</translation>
    </message>
 </context>
 <context>
@@ -767,7 +769,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderman.cpp" line="1142"/>
        <source>Waiting to start syncing.</source>
-        <translation type="unfinished"/>
+        <translation>Čaká sa na začiatok synchronizácie</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1145"/>
@@ -860,7 +862,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
        <source>Synchronizing with local folder</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizujem lokálny priečinok</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -892,7 +894,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Odhlásený</translation>
    </message>
@@ -902,96 +904,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
-        <translation type="unfinished"/>
+        <translation>Načítavam zoznam priečinkov zo servera...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Kontrolujú sa zmeny v „%1“</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synchronizuje sa %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>stiahnuť %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>nahrať %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 of %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>súbor %1 z %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Čakajte...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Príprava na synchronizáciu...</translation>
    </message>
@@ -1515,18 +1517,18 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="50"/>
        <source>Created at %1</source>
-        <translation type="unfinished"/>
+        <translation>Vytvorený o %1</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="99"/>
        <source>Closing in a few seconds...</source>
-        <translation type="unfinished"/>
+        <translation>Ukončenie o pár sekúnd...</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="133"/>
        <source>%1 request failed at %2</source>
        <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
-        <translation type="unfinished"/>
+        <translation>%1 požiadavka zlyhala o %2</translation>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.cpp" line="139"/>
@@ -1910,9 +1912,9 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -1935,7 +1937,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
        <source>File was deleted from server</source>
-        <translation type="unfinished"/>
+        <translation>Súbor bol vymazaný zo servera</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
@@ -1948,19 +1950,19 @@ Nie je vhodné ju používať.</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>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</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>Súbor sa medzitým zmenil</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>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2001,7 +2003,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2032,7 +2034,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2058,7 +2060,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2086,7 +2088,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2135,7 +2137,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="800"/>
        <source>Error writing metadata to the database</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri zápise metadát do databázy</translation>
    </message>
 </context>
 <context>
@@ -2178,7 +2180,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="78"/>
        <source>Local sync protocol</source>
-        <translation type="unfinished"/>
+        <translation>Lokálny protokol synchronizácie</translation>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="80"/>
@@ -2347,7 +2349,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="14"/>
        <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Dialóg</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="47"/>
@@ -2444,18 +2446,18 @@ Nie je vhodné ju používať.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Verejné z&amp;dieľanie vyžaduje heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Prosím nastavte si heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Zdieľať odkaz</translation>
    </message>
@@ -2846,12 +2848,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="191"/>
        <source>An error occurred while opening a folder</source>
-        <translation type="unfinished"/>
+        <translation>Nastala chyba počas otvárania priečinka</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="194"/>
        <source>Error while reading folder.</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri čítaní adresára</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="440"/>
@@ -2865,12 +2867,12 @@ Nie je vhodné ju používať.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2922,7 +2924,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="188"/>
        <source>Access is forbidden</source>
-        <translation type="unfinished"/>
+        <translation>Prístup odmietnutý</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="199"/>
@@ -2975,64 +2977,64 @@ Nie je vhodné ju používať.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno čítať zo synchronizačného žurnálu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Nemožno otvoriť sync žurnál</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Názov súboru obsahuje nevhodný 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="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorované podľa nastavenia &quot;vybrať čo synchronizovať&quot;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
-        <translation type="unfinished"/>
+        <translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Presunutie nie je dovolené. Položka obnovená.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>cieľ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -3042,7 +3044,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/synclogdialog.ui" line="14"/>
        <source>Synchronisation Log</source>
-        <translation type="unfinished"/>
+        <translation>Záznam synchronizácie</translation>
    </message>
 </context>
 <context>
@@ -3062,8 +3064,8 @@ Nie je vhodné ju používať.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3081,7 +3083,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/checksums.cpp" line="204"/>
        <source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Hlavička kontrolného súčtu obsahovala neznámy typ kontrolného súčtu „%1“</translation>
    </message>
    <message>
        <location filename="../src/libsync/checksums.cpp" line="209"/>
@@ -3121,7 +3123,7 @@ Nie je vhodné ju používať.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="544"/>
        <location filename="../src/gui/owncloudgui.cpp" line="611"/>
        <source>Log in...</source>
-        <translation type="unfinished"/>
+        <translation>Prihlásiť sa...</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="394"/>
@@ -3139,7 +3141,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="656"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Kontrolujú sa zmeny v „%1“</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="367"/>
@@ -3184,12 +3186,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="271"/>
        <source>Disconnected from %1</source>
-        <translation type="unfinished"/>
+        <translation>Odpojený od %1</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="236"/>
        <source>Unsupported Server Version</source>
-        <translation type="unfinished"/>
+        <translation>Nepodporovaná verzia servera</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="237"/>
@@ -3199,7 +3201,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="275"/>
        <source>Disconnected from accounts:</source>
-        <translation type="unfinished"/>
+        <translation>Odpojené od účtov:</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="277"/>
@@ -3209,47 +3211,47 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="296"/>
        <source>Account synchronization is disabled</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizácia účtu je vypnutá</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="379"/>
        <source>Unpause all folders</source>
-        <translation type="unfinished"/>
+        <translation>Zrušiť pozastavenie všetkých priečinkov</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="384"/>
        <source>Pause all folders</source>
-        <translation type="unfinished"/>
+        <translation>Pozastaviť všetky priečinky</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="515"/>
        <source>Unpause all synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Zrušiť pozastavenie všetkej synchronizácie</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="517"/>
        <source>Unpause synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Zrušiť pozastavenie synchronizácie</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="525"/>
        <source>Pause all synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Pozastaviť všetku synchronizáciu</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="527"/>
        <source>Pause synchronization</source>
-        <translation type="unfinished"/>
+        <translation>Pozastaviť synchronizáciu</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="534"/>
        <source>Log out of all accounts</source>
-        <translation type="unfinished"/>
+        <translation>Odhlásiť sa zo všetkých účtov</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="542"/>
        <source>Log in to all accounts...</source>
-        <translation type="unfinished"/>
+        <translation>Prihlásiť sa do všetkých účtov...</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="617"/>
@@ -3285,10 +3287,10 @@ Nie je vhodné ju používať.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Verzia %2. Ďalšie informácie získate na adrese &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Autori Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a ďalší.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licencované za podmienok GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud a ownCloud Logo sú registrované obchodné známky ownCloud, Inc. v USA, ďalších krajinách, alebo oboje.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3499,7 +3501,7 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -3509,37 +3511,37 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/utility.cpp" line="473"/>
        <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>v budúcnosti</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="469"/>
        <source>%n day(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>pred %n dňom</numerusform><numerusform>pred %n dňami</numerusform><numerusform>pred %n dňami</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="477"/>
        <source>%n hour(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>pred %n hodinou</numerusform><numerusform>pred %n hodinami</numerusform><numerusform>pred %n hodinami</numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="482"/>
        <source>now</source>
-        <translation type="unfinished"/>
+        <translation>teraz</translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="484"/>
        <source>Less than a minute ago</source>
-        <translation type="unfinished"/>
+        <translation>Menej ako pred minútou</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="487"/>
        <source>%n minute(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>pred %n minútou</numerusform><numerusform>pred %n minútami</numerusform><numerusform>pred %n minútami</numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="490"/>
        <source>Some time ago</source>
-        <translation type="unfinished"/>
+        <translation>Pred istým časom</translation>
    </message>
 </context>
 <context>
@@ -3567,32 +3569,32 @@ Nie je vhodné ju používať.</translation>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="319"/>
        <source>%n year(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="320"/>
        <source>%n month(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n mesiac</numerusform><numerusform>%n mesiace</numerusform><numerusform>%n mesiacov</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="321"/>
        <source>%n day(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="322"/>
        <source>%n hour(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="323"/>
        <source>%n minute(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="324"/>
        <source>%n second(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="348"/>
@@ -3636,7 +3638,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
        <source>Server version downloaded, copied changed local file into conflict file</source>
-        <translation type="unfinished"/>
+        <translation>Verzia zo servera bola stiahnutá, kópia zmenila lokálny súbor na konfliktný súbor</translation>
    </message>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
    </message>
@@ -894,7 +894,7 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi
        <translation>Prišlo je do napake med nalaganjem datotek s strežnika.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Odjavljeno</translation>
    </message>
@@ -904,96 +904,96 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi
        <translation>Dodajanje mape je onemogočeno, ker se usklajojejo vse vaše datoteke. Če želite usklajevati več map, odstranite trenutno nastavljeno korensko mapo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Poteka pridobivanje seznama map s strežnika ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Preverjanje za spremembe v &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Usklajevanje %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>,</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>prejemanje %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>pošiljanje %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 od %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>Preostalo še %5, %1 od %2, datoteka %3 od %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>datoteka %1 od %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Čakanje na povezavo ...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>V pripravi je %n druga map ...</numerusform><numerusform>V pripravi sta %n drugi mapi ...</numerusform><numerusform>V pripravi so %n druge mape ...</numerusform><numerusform>V pripravi je %n drugih map ...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Priprava na usklajevanje ...</translation>
    </message>
@@ -1917,7 +1917,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
    </message>
@@ -1955,17 +1955,17 @@ Uporaba ni priporočljiva.</translation>
        <translation>Prejeta datoteka je prazna, čeprav je na strežniku objavljena z %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</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>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</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>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
    </message>
@@ -2451,18 +2451,18 @@ Uporaba ni priporočljiva.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Javna omogočanje &amp;souporabe zahteva geslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Določite geslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>Povezava za &amp;souporabo</translation>
    </message>
@@ -2551,7 +2551,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Pogled razhroščevalnika šifer SSL</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2872,12 +2872,12 @@ Uporaba ni priporočljiva.</translation>
        <translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje starševske mape</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
    </message>
@@ -2982,64 +2982,64 @@ Uporaba ni priporočljiva.</translation>
        <translation>Ni mogoče prebrati črnega seznama iz krajevne mape</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Ni mogoče brati iz dnevnika usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Ime datoteke vsebuje vsaj en neveljaven 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="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>cilj</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>vir</translation>
    </message>
@@ -3069,8 +3069,8 @@ Uporaba ni priporočljiva.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Avtorske pravice ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Avtorske pravice ownCloud, GmbH&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3292,10 +3292,10 @@ Uporaba ni priporočljiva.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Različica %2. Več podrobnosti je zabeleženih na &lt;a href=&apos;%3&apos;&gt;%4&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;&lt;small&gt;Avtorstvo: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz in drugi.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Avtorske pravice ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Programski paket je objavljen z dovoljenjem GNU General Public License (GPL) Version 2.0.&lt;br/&gt;ownCloud in logotip ownCloud sta blagovni znamki ownCloud v Združenih državah, drugih državah ali oboje.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3506,7 +3506,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -889,7 +889,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/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Одјављен</translation>
    </message>
@@ -899,96 +899,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Добављам списак фасцикли са сервера...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Проверавам измене у „%1“</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>„%1“</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Синхронизујем %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>, </translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>преузми %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>отпреми %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 од %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>фајл %1 од %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Чекам...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Припремам синхронизацију...</translation>
    </message>
@@ -1911,7 +1911,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation type="unfinished"/>
    </message>
@@ -1949,17 +1949,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>
@@ -2445,18 +2445,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Јавно дељење з&amp;хтева лозинку</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Поставите лозинку</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Веза дељења</translation>
    </message>
@@ -2866,12 +2866,12 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation type="unfinished"/>
    </message>
@@ -2976,64 +2976,64 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <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="837"/>
        <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="894"/>
        <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="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>одредиште</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>извор</translation>
    </message>
@@ -3063,8 +3063,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ауторска права оунКлауд (ownCloud), корпорација&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3286,10 +3286,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Верзија %2. За више информација посетите &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Клас Фрајтаг (Klaas Freitag), Данијел Мелкентин (Daniel Molkentin), Жан-Кристоф Боршар (Jan-Christoph Borchardt), Оливије Гофар (Olivier Goffart), Маркус Гец (Markus Götz) и остали.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Ауторска права ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Лиценцирано под ГНУ Општом јавном лиценцом ОЈЛ (GPL) верзије 2.0&lt;br/&gt;оунКлауд и оунКлауд логотип су регистроване робне марке ownCloud, Inc. у САД, другим земљама, или обоје.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3500,7 +3500,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation type="unfinished"/>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>Fel vid skrivning av metadata till databasen</translation>
    </message>
@@ -894,7 +894,7 @@ Om du fortsätter synkningen leder till att dina filer skrivs över av äldre fi
        <translation>Ett fel uppstod när mapplistan försökte laddas från servern.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>Utloggad</translation>
    </message>
@@ -904,96 +904,96 @@ Om du fortsätter synkningen leder till att dina filer skrivs över av äldre fi
        <translation>Tillägg av mappar är avstängt eftersom du redan synkar alla dina filer. Om du vill synka fler mappar, var god ta bort den nuvarande rotmappen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>Hämtar mapplistan från servern...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>Kollar efter ändringar i &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>Synkroniserar %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>,</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>ladda ner %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>ladda upp %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/s</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 av %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>%5 kvar, %1 av %2, fil %3 av %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>fil %1 av %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>Väntar...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>Väntat på %n annan mapp...</numerusform><numerusform>Väntat på %n andra mappar...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>Förbereder för att synkronisera...</translation>
    </message>
@@ -1918,7 +1918,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>Fel vid skrivning av metadata till databasen</translation>
    </message>
@@ -1956,17 +1956,17 @@ Det är inte lämpligt använda den.</translation>
        <translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>Filen har ändrats sedan upptäckten</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>Fel vid skrivning av metadata till databasen</translation>
    </message>
@@ -2452,18 +2452,18 @@ Det är inte lämpligt använda den.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Publik d&amp;elning kräver lösenord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>Var vänlig sätt lösenord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;Dela länk</translation>
    </message>
@@ -2552,7 +2552,7 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>Debugvy SSL-kryptering</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2873,12 +2873,12 @@ Det är inte lämpligt använda den.</translation>
        <translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
        <translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
    </message>
@@ -2983,64 +2983,64 @@ Det är inte lämpligt använda den.</translation>
        <translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>Kunde inte läsa från synk-journalen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <source>Cannot open the sync journal</source>
        <translation>Kunde inte öppna synk journalen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="887"/>
+        <location filename="../src/libsync/syncengine.cpp" line="894"/>
        <source>File name contains at least one invalid character</source>
        <translation>Filnamnet innehåller minst ett ogiltigt tecken</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="1105"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorerad eftersom den är svartlistad i &quot;välj vad som ska synkas&quot; </translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1117"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1124"/>
        <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
        <translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1159"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1166"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Inte behörig att radera, återställer</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1209"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1216"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokala filer och mappar som är delade är borttagna.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1265"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1272"/>
        <source>Move not allowed, item restored</source>
        <translation>Det gick inte att genomföra flytten, objektet återställs</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1276"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1283"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the destination</source>
        <translation>destinationen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>källan</translation>
    </message>
@@ -3070,8 +3070,8 @@ Det är inte lämpligt använda den.</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3293,10 +3293,10 @@ Det är inte lämpligt använda den.</translation>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Version %2. För mer information, gå till &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz med flera.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensierad under GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud och ownClouds logo är registrerade varumärken av ownCloud, Inc. i USA, andra länder eller både och.&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3507,7 +3507,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.1">
 <context>
    <name>FileSystem</name>
    <message>
@@ -522,7 +522,7 @@
 <context>
    <name>OCC::CleanupPollsJob</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
        <source>Error writing metadata to the database</source>
        <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
    </message>
@@ -895,7 +895,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>ข้อผิดพลาดในขณะที่โหลดรายชื่อโฟลเดอร์จากเซิร์ฟเวอร์</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="205"/>
        <source>Signed out</source>
        <translation>ออกจากระบบ</translation>
    </message>
@@ -905,96 +905,96 @@ Continuing the sync as normal will cause all your files to be overwritten by an
        <translation>การเพิ่มโฟลเดอร์ถูกยกเลิกเพราะคุณได้ประสานไฟล์ทั้งหมดของคุณอยู่แล้ว หากคุณต้องการประสานข้อมูลหลายโฟลเดอร์โปรดลบโฟลเดอร์รากกำหนดค่าในปัจจุบัน</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="170"/>
        <source>Fetching folder list from server...</source>
        <translation>กำลังดึงรายการโฟลเดอร์จากเซิร์ฟเวอร์ ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="832"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="841"/>
        <source>Checking for changes in &apos;%1&apos;</source>
        <translation>กำลังตรวจสอบการเปลี่ยนแปลงใน &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="876"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
        <translation>, &apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
        <translation>&apos;%1&apos;</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
        <translation>กำลังประสานข้อมูล %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="907"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="906"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="916"/>
        <source>, </source>
        <translation>หรือ</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="901"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>ดาวน์โหลด %1/วินาที</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="903"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
        <source>u2193 %1/s</source>
        <translation>u2193 %1/วินาที</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="910"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
        <translation>อัปโหลด</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="912"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
        <source>u2191 %1/s</source>
        <translation>u2191 %1/วินาที</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="917"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
        <source>%1 %2 (%3 of %4)</source>
        <extracomment>Example text: &quot;uploading foobar.png (2MB of 2MB)&quot;</extracomment>
        <translation>%1 %2 (%3 ของ %4)</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="930"/>
        <source>%1 %2</source>
        <extracomment>Example text: &quot;uploading foobar.png&quot;</extracomment>
        <translation>%1 %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
        <source>%5 left, %1 of %2, file %3 of %4</source>
        <extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
        <translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
        <source>file %1 of %2</source>
        <translation>ไฟล์ %1 จาก %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="984"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
        <source>Waiting...</source>
        <translation>กรุณารอซักครู่...</translation>
    </message>
    <message numerus="yes">
-        <location filename="../src/gui/folderstatusmodel.cpp" line="986"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
        <source>Waiting for %n other folder(s)...</source>
        <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation>
    </message>
    <message>
-        <location filename="../src/gui/folderstatusmodel.cpp" line="992"/>
+        <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
        <source>Preparing to sync...</source>
        <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation>
    </message>
@@ -1918,7 +1918,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDirectory</name>
    <message>
-        <location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
+        <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
        <source>Error writing metadata to the database</source>
        <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
    </message>
@@ -1953,20 +1953,20 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
        <source>The downloaded file is empty despite the server announced it should have been %1.</source>
-        <translation type="unfinished"/>
+        <translation>ไฟล์ที่ดาวน์โหลดว่างเปล่าแม้ว่าเซิร์ฟเวอร์ประกาศว่าควรจะเป็น %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="693"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="694"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="741"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="742"/>
        <source>File has changed since discovery</source>
        <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="791"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="792"/>
        <source>Error writing metadata to the database</source>
        <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
    </message>
@@ -2452,18 +2452,18 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>การแชร์สาธารณะจำเป็นต้องมีรหัสผ่าน</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="434"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
        <source>Please Set Password</source>
        <translation>กรุณาตั้งรหัสผ่าน</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="498"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="499"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
        <source>&amp;Share link</source>
        <translation>&amp;แชร์ลิงค์</translation>
    </message>
@@ -2552,7 +2552,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="91"/>
        <source>SSL Chipher Debug View</source>
-        <translation type="unfinished"/>
+        <translation>ดู SSL Chipher Debug</translation>
    </message>
    <message>
        <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="99"/>
@@ -2871,12 +2871,12 @@ It is not advisable to use it.</source>
        <translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1132"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1139"/>
        <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="1146"/>
        <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
        <translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation>
    </message>
@@ -2981,64 +2981,64 @@ It is not advisable to use it.</source>
        <translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลต้นทาง</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="787"/>
+        <location filename="../src/libsync/syncengine.cpp" line="791"/>
        <source>Unable to read from the sync journal.</source>
        <translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="833"/>
+        <location filename="../src/libsync/syncengine.cpp" line="837"/>
        <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="894"/>
        <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="1105"/>
        <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="1124"/>
        <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="1166"/>
        <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="1183"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1203"/>
        <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="1216"/>
        <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="1272"/>
        <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="1283"/>
        <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="1284"/>
        <source>the destination</source>
        <translation>ปลายทาง</translation>
    </message>
    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="1277"/>
+        <location filename="../src/libsync/syncengine.cpp" line="1284"/>
        <source>the source</source>
        <translation>แหล่งที่มา</translation>
    </message>
@@ -3068,8 +3068,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="289"/>
-        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;จดทะเบียนภายใต้ลิขสิทธิ์ของ ownCloud&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="290"/>
@@ -3291,10 +3291,10 @@ It is not advisable to use it.</source>
 </context>
 <context>
    <name>OCC::ownCloudTheme</name>
-    <message utf8="true">
+    <message>
        <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
-        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;รุ่น %2 สำหรับข้อมูลเพิ่มเติมดูได้ที่&lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt; โดย Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz และอีกหลายคนที่ไม่ได้เอ่ยนาม &lt;/small&gt;&lt;/p&gt;&lt;p&gt; สงวนลิขสิทธิ์ ownCloud, Inc.&lt;/p&gt;&lt;p&gt;ได้รับใบอนุญาตภายใต้ GNU General Public License (GPL) รุ่น 2.0&lt;br/&gt; ownCloud และโลโก้ ownCloud เป็นเครื่องหมายจดทะเบียนการค้าของ ownCloud ในประเทศสหรัฐอเมริกา ประเทศอื่นๆ หรือทั้งสองอย่าง&lt;/p&gt;</translation>
+        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud GmbH&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3505,7 +3505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>QApplication</name>
    <message>
-        <location filename="../src/gui/application.cpp" line="593"/>
+        <location filename="../src/gui/application.cpp" line="599"/>
        <source>QT_LAYOUT_DIRECTION</source>
        <translation>QT_LAYOUT_DIRECTION</translation>
    </message>
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Markus Goetz	eaeed08544	VERSION.cmake: 2.2.4 final	2016-09-27 10:53:37 +02:00
Markus Goetz	f1e2e42d99	2.2.4: Set release date	2016-09-27 10:52:18 +02:00
Christian Kamm	3e1690ff7a	Improvements to file recall	2016-09-14 15:42:19 +02:00
Jenkins for ownCloud	826a675f32	[tx-robot] updated from transifex	2016-09-27 02:18:32 +02:00
Jenkins for ownCloud	323ebf9bf2	[tx-robot] updated from transifex	2016-09-26 02:18:30 +02:00
Jenkins for ownCloud	e4bf3ec19a	[tx-robot] updated from transifex	2016-09-25 02:18:36 +02:00
Jenkins for ownCloud	f2721aff1d	[tx-robot] updated from transifex	2016-09-24 02:18:33 +02:00
Markus Goetz	29bd8658bb	ChangeLog: 2.2.4	2016-09-22 15:41:30 +02:00
Klaas Freitag	8b9ca63eeb	Dolphin Plugin: Use the Application name for the socket path (#5172 ) do not hardcode. This should fix #5165 (cherry picked from commit `2d110540ee`)	2016-09-22 09:20:47 +02:00
Olivier Goffart	6f1b03c560	SyncEngine: Fix renaming of folder when file are changed (#5195 ) Two bugs: - The change filed are not considered as move, they are re-downloaded but the old file was not removed from the database. The change in owncloudpropagator.cpp takes care of removing the old entries. - Next sync would then remove the file in the server in the old folder This was not a problem until we start reusing the sync engine, and that the _renamedFolders map is not cleared. We were before deleting a non-existing file. But now we delete the actual file. Also improve the tests to be able to do move on the server. This include support for file id. Issue #5192 (cherry picked from commit `85b8ab178e`)	2016-09-22 09:05:09 +02:00
Jenkins for ownCloud	3bd3ffb8e2	[tx-robot] updated from transifex	2016-09-22 02:18:32 +02:00
Olivier Goffart	a810d69daa	ConnectionValidator: properly handle error in status.php (#5188 ) We wwer enot connecting to the right signal from the check server job, and therefore we were not catching the condition in which the json was invalid. We would then never terminate the ConnectionValidator job. Note that instanceNotFound is also emited if there is a network error. The log looked like this: 10:25:51.247 OCC::CheckServerJob::finished: status.php from server is not valid JSON! 10:25:51.248 OCC::CheckServerJob::finished: status.php returns: QMap() QNetworkReply::NetworkError(NoError) Reply: QNetworkReplyHttpImpl(0x2b6a790) 10:25:51.248 OCC::CheckServerJob::finished: No proper answer on QUrl("http://localhost/~owncloud/status.php") 10:26:23.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost" 10:26:55.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost" [...] (cherry picked from commit `ff701bd473`)	2016-09-21 14:30:36 +02:00
Jenkins for ownCloud	8496817db2	[tx-robot] updated from transifex	2016-09-21 02:18:30 +02:00
Jenkins for ownCloud	3d06f4b7c9	[tx-robot] updated from transifex	2016-09-20 09:12:39 +02:00
Olivier Goffart	b228488eb7	Revert "FolderWatcher: Act on relative paths #5116 (#5153 )" This is not sufficient as it is not working for the Socket API. Next commit will fix it in another layer. Also, not ignoring paths that are not inside the folder is wrong as it might still happen if the name has a different casing This reverts commit `d5a481f132`. (cherry picked from commit `904cd46f75`)	2016-09-15 16:26:25 +02:00
Markus Goetz	907918dca3	FolderWatcher: Act on relative paths #5116 (#5153 ) (cherry picked from commit `d5a481f132`)	2016-09-12 14:09:13 +02:00
Christian Kamm	5ffaf3a90f	Set discovery thread priority to low #5017 (cherry picked from commit `bd7ec19644`)	2016-09-12 14:09:13 +02:00
Olivier Goffart	1040e7b57b	ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS If the folder has different case in the settings and in the FS, we should not ignore all the files. This is important for the files system watcher. (cherry picked from commit `98268d102f`)	2016-09-12 14:09:12 +02:00
Olivier Goffart	65c49e1de6	CleanupPollsJob: Fix possible leak Missing deleteLater when the CleanupPollsJob aborts. This is only a problem if the SyncEngine is kept alive a long time. Which is usually not the case in the configuration where poll jobs are used. (cherry picked from commit `3465024898`)	2016-09-12 14:09:12 +02:00
Christian Kamm	4abaee7736	Recall: Copy instead of move recalled file #5150 That was an unintentional change in `2662203fb7` Also expand the test case to cover this. (cherry picked from commit `af9c4d0e2f`)	2016-09-12 14:09:12 +02:00
Markus Goetz	3cdcd8dea0	Selective Sync: Fix request loop and show error in view (#5154 ) I got into a situation where the model would endlessly request the directory contents from the server because we did not notice yet that the server is actually in maintenance mode while we were expanding the tree view when changing the tab to the account or when just expanding it by clicking. (cherry picked from commit `524220d090`)	2016-09-12 14:09:12 +02:00
Christian Kamm	cb19ebc9e3	ShareLink: Ensure the password line edit is enabled #5117 (cherry picked from commit `b541fea793`)	2016-09-12 14:09:12 +02:00
Daniel Molkentin	37adaa7872	Update owner to be ownCloud GmbH Fixes #5079 (cherry picked from commit `a83c5598e8`)	2016-09-12 14:09:12 +02:00
Christian Kamm	9d93afb2a1	Switch target version of this branch to 2.2.4	2016-09-12 14:07:33 +02:00
Jenkins for ownCloud	7c24ed769e	[tx-robot] updated from transifex	2016-09-06 02:18:30 +02:00
Jenkins for ownCloud	65110f7a91	[tx-robot] updated from transifex	2016-09-05 02:18:30 +02:00
Jenkins for ownCloud	c33abd468d	[tx-robot] updated from transifex	2016-09-04 02:18:30 +02:00
Jenkins for ownCloud	584b205bd5	[tx-robot] updated from transifex	2016-09-03 02:18:31 +02:00
Jenkins for ownCloud	b75f50d62c	[tx-robot] updated from transifex	2016-09-02 02:18:31 +02:00
Jenkins for ownCloud	14457e93e6	[tx-robot] updated from transifex	2016-09-01 02:18:31 +02:00
Jenkins for ownCloud	9c0ecad420	[tx-robot] updated from transifex	2016-08-31 02:18:30 +02:00
Jenkins for ownCloud	85b5fdb3d3	[tx-robot] updated from transifex	2016-08-30 02:18:35 +02:00
Jenkins for ownCloud	f2c6669224	[tx-robot] updated from transifex	2016-08-29 02:18:30 +02:00
Jenkins for ownCloud	d8f9bf3a0b	[tx-robot] updated from transifex	2016-08-28 02:18:32 +02:00
Jenkins for ownCloud	d5fa8faa91	[tx-robot] updated from transifex	2016-08-27 02:18:32 +02:00
Jenkins for ownCloud	d1a1b95926	[tx-robot] updated from transifex	2016-08-26 02:18:32 +02:00
Jenkins for ownCloud	ee2a67e332	[tx-robot] updated from transifex	2016-08-25 02:18:31 +02:00
Jenkins for ownCloud	7362575d64	[tx-robot] updated from transifex	2016-08-24 02:18:30 +02:00
Jenkins for ownCloud	6a9b6c1167	[tx-robot] updated from transifex	2016-08-23 02:18:33 +02:00
Jenkins for ownCloud	8e00fd66de	[tx-robot] updated from transifex	2016-08-22 02:18:31 +02:00
Jenkins for ownCloud	ef035ea7f9	[tx-robot] updated from transifex	2016-08-21 02:18:31 +02:00
Jenkins for ownCloud	77b5c5e963	[tx-robot] updated from transifex	2016-08-20 02:18:31 +02:00
Jenkins for ownCloud	687549c455	[tx-robot] updated from transifex	2016-08-19 09:58:44 +02:00
Jenkins for ownCloud	677c34fbf8	[tx-robot] updated from transifex	2016-08-18 02:18:30 +02:00
Jenkins for ownCloud	465639af82	[tx-robot] updated from transifex	2016-08-17 02:18:31 +02:00
Jenkins for ownCloud	583f9586aa	[tx-robot] updated from transifex	2016-08-16 02:18:31 +02:00
Jenkins for ownCloud	573d942969	[tx-robot] updated from transifex	2016-08-15 02:18:30 +02:00
Jenkins for ownCloud	02df088843	[tx-robot] updated from transifex	2016-08-14 02:18:30 +02:00
Jenkins for ownCloud	cd9335e043	[tx-robot] updated from transifex	2016-08-12 02:18:30 +02:00
Jenkins for ownCloud	20531e57a8	[tx-robot] updated from transifex	2016-08-11 02:18:39 +02:00
Jenkins for ownCloud	e2e16aeaaa	[tx-robot] updated from transifex	2016-08-10 02:18:38 +02:00
Thomas Müller	a46a69f250	[2.2] Jenkinsfile: Add win32 build (#5091 ) (#5115 )	2016-08-09 16:20:32 +02:00
Jenkins for ownCloud	3187a22300	[tx-robot] updated from transifex	2016-08-09 02:18:41 +02:00
Markus Goetz	9626021a63	Update ChangeLog for 2.2.3 final	2016-08-08 15:39:49 +02:00
Jenkins for ownCloud	b72a19ad64	[tx-robot] updated from transifex	2016-08-08 02:18:35 +02:00
Markus Goetz	2ae37c6beb	Update ChangeLog	2016-08-07 22:51:16 +02:00
Jenkins for ownCloud	f8f376ac03	[tx-robot] updated from transifex	2016-08-07 02:18:30 +02:00
Jenkins for ownCloud	632d231435	[tx-robot] updated from transifex	2016-08-06 02:18:34 +02:00
Markus Goetz	fc868d89f3	Merge pull request #5108 from owncloud/limit_library_path Limit Qt and OpenSSL Library pathes to the install directory	2016-08-05 16:39:04 +02:00
Daniel Molkentin	5a57e4a7a6	Ensure OpenSSL config file is only read from app dir	2016-08-05 16:38:08 +02:00
Jenkins for ownCloud	70a1671dc1	[tx-robot] updated from transifex	2016-08-05 14:23:25 +02:00
Daniel Molkentin	7de70516f1	Fix module loading	2016-08-05 12:35:52 +02:00
Jenkins for ownCloud	50bd4b8f4f	[tx-robot] updated from transifex	2016-08-05 02:18:30 +02:00
Olivier Goffart	4a7f3cb486	SyncEngine: Fix detection of backup (#5104 ) Once upon a time, the SyncEngine was instantiated once per sync. But now that the SyncEngine is kept between sync, we need to reset all these variable between syncs.	2016-08-04 16:06:10 +02:00
Jenkins for ownCloud	b7663d00b9	[tx-robot] updated from transifex	2016-08-04 02:18:35 +02:00
Jocelyn Turcotte	b307f2b65c	Revert "Fix a deadlock when shutting down during discovery" (#5100 ) Reverts commit `622017adcf` Could be the cause of #5092 and the cost is higher than the benefit if this is the case. A network request taking more than 30 seconds isn't something unlikely in this world and shouldn't be a good reason to abort. We should try to untangle the threads dependencies to properly fix this if possible instead.	2016-08-03 16:35:24 +02:00
Jenkins for ownCloud	6c94d56b53	[tx-robot] updated from transifex	2016-08-03 02:18:37 +02:00
Jenkins for ownCloud	c51a80bffa	[tx-robot] updated from transifex	2016-08-02 02:18:35 +02:00
Thomas Müller	87f4f70abb	Merge pull request #5069 from owncloud/Jenkinsfile-2.2 [2.2] Add Jenkinsfile (#5041)	2016-08-01 12:41:04 +02:00
Olivier Goffart	19a52b9e6b	Qt4: don't require a X server in the tests Issue #5069 (cherry picked from commit `927a8b5071` and `a4310f0f5c`)	2016-08-01 11:57:21 +02:00
Jenkins for ownCloud	4ea70ebd18	[tx-robot] updated from transifex	2016-08-01 02:48:18 +02:00
Jenkins for ownCloud	b9a6970282	[tx-robot] updated from transifex	2016-07-31 02:50:05 +02:00
Jenkins for ownCloud	a58ef9c586	[tx-robot] updated from transifex	2016-07-30 02:39:29 +02:00
Thomas Müller	cef24da44c	Add Jenkinsfile (#5041 )	2016-07-29 08:48:28 +02:00
Jenkins for ownCloud	23c7f10b79	[tx-robot] updated from transifex	2016-07-29 02:18:35 +02:00
Jenkins for ownCloud	9e514d6cc7	[tx-robot] updated from transifex	2016-07-28 02:18:39 +02:00
Jenkins for ownCloud	4d109e43fa	[tx-robot] updated from transifex	2016-07-27 02:18:42 +02:00
Daniel Molkentin	b575ded464	More GmbH -> Inc Copyright header fixes	2016-07-26 16:53:11 +02:00
Jocelyn Turcotte	03a90bf03f	shell/windows: Build 43, add missing 32 bit binaries Also include a minor change from #5025	2016-07-26 14:54:27 +02:00
Jocelyn Turcotte	ff7b2381e9	shell/windows: Add missing Win32 configuration changes The changes in build location were only done on the x64 configuration.	2016-07-26 14:53:14 +02:00
Markus Goetz	24cd8041a8	ChangeLog for 2.2.3	2016-07-26 12:14:00 +02:00
Jenkins for ownCloud	3eaadfe52f	[tx-robot] updated from transifex	2016-07-26 02:43:40 +02:00
Klaas Freitag	ebcec44202	ShibbolethView: Open a debug windows that shows cipher info. (#5080 ) It opens a window and connects to a cipher test page, showing the output from there, that helps for debugging. The window is enabled by setting the environment variable OWNCLOUD_SHIBBOLETH_DEBUG	2016-07-25 17:47:23 +02:00
Jenkins for ownCloud	7b0b7fde51	[tx-robot] updated from transifex	2016-07-25 02:18:34 +02:00
Jenkins for ownCloud	fa9ec12ae7	[tx-robot] updated from transifex	2016-07-24 02:18:36 +02:00
Jenkins for ownCloud	54aa4dce46	[tx-robot] updated from transifex	2016-07-23 02:18:47 +02:00
Jenkins for ownCloud	7c19f748b7	[tx-robot] updated from transifex	2016-07-22 02:18:44 +02:00
Jenkins for ownCloud	5aa82944a4	[tx-robot] updated from transifex	2016-07-21 02:18:38 +02:00
Jenkins for ownCloud	0d9cf26890	[tx-robot] updated from transifex	2016-07-20 08:18:40 +02:00
Jenkins for ownCloud	a4837e9291	[tx-robot] updated from transifex	2016-07-19 08:18:37 +02:00
Jenkins for ownCloud	5672557a84	[tx-robot] updated from transifex	2016-07-18 09:29:56 +02:00
Jenkins for ownCloud	0b31f2601d	[tx-robot] updated from transifex	2016-07-18 08:18:44 +02:00
Jenkins for ownCloud	a5850d4515	[tx-robot] updated from transifex	2016-07-17 08:18:34 +02:00
Jenkins for ownCloud	c39eb315dd	[tx-robot] updated from transifex	2016-07-16 08:18:34 +02:00
Jenkins for ownCloud	6c8e88e2ed	[tx-robot] updated from transifex	2016-07-15 08:18:36 +02:00
Jenkins for ownCloud	eeea255104	[tx-robot] updated from transifex	2016-07-14 08:18:43 +02:00
Jenkins for ownCloud	8e2af57b57	[tx-robot] updated from transifex	2016-07-13 02:18:41 -04:00