Bump to beta1

2016-01-18 16:26:46 +01:00
@@ -7,6 +7,7 @@ CMakeLists.txt.user*
 doc/_build/*
 *.kate-swp
 *.kdev4
+win/
 admin/win/nsi/l10n/pofiles/*.po
 *.swp
 *~$
@@ -3,7 +3,7 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = https://github.com/guruz/qtmacgoodies.git
+	url = git://github.com/guruz/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.8.0)

@@ -123,17 +122,6 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()

-# When this option is enabled, a rename that is not allowed will be renamed back
-# do the original as a restoration step.  Withut this option, the restoration will
-# re-download the file instead.
-# The default is off because we don't want to rename the files back behind the user's back
-# Added for IL issue #550
-option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF)
-if(OWNCLOUD_RESTORE_RENAME)
-    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
-endif()
-
-
 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.1.1 (release 2016-02-10)
+version 2.1.1 (release 2016-01-2x)
 * UI improvements for HiDPI screens, error messages, RTL languages
 * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
 * Fix undeliberate WiFi scanning done by Qt Network classes
@@ -14,11 +14,9 @@ version 2.1.1 (release 2016-02-10)
 * Allow changeable upload chunk size in owncloud.cfg
 * Crash fixes on account deletion
 * Forget password on explicit sign-out
- * OS X: Fix the file system watcher ignoring unicode paths (#4424)
- * Windows Installer: Update to NSIS 2.50, fixes possible DLL injection
 * Sync Engine: .lnk files
 * Sync Engine: symlinked syn directories
- * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277)
+ * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308 #4277)
 * Sync Engine: Fixes for files becoming directories and vice versa (#4302)
 * Misc other fixes/improvements

@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_SOVERSION 0 )

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -25,8 +25,6 @@ def extractDeps(macho):
    deps = [macho]
    otool = subprocess.Popen(['otool', '-L', macho], stdout=subprocess.PIPE)
    for l in otool.communicate()[0].splitlines():
-        if 'is not an object file' in l:
-            return []
        m = re.search(r'@[^\s]+', l)
        if m:
            path = resolvePath(m.group(0))
@@ -249,38 +249,35 @@ def CopyPlugin(path, subdir):
  commands.append(args)
  return new_path

-def CopyFramework(source_dylib):
-  parts = source_dylib.split(os.sep)
-  print "CopyFramework:", source_dylib
+def CopyFramework(path):
+  parts = path.split(os.sep)
+  print "CopyFramework:", path
  for i, part in enumerate(parts):
    matchObj = re.match(r'(\w+\.framework)', part)
    if matchObj:
+      full_path = os.path.join(frameworks_dir, *parts[i:-1])
      framework = matchObj.group(1)
-      dylib_name = parts[-1]
-      source_path = os.path.join('/', *parts[:i+1])
-      dest_path = os.path.join(frameworks_dir, framework)
-      dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
      break
-  if os.path.exists(dest_path):
-    print dest_path, "already exists, skipping copy..."
-    return os.path.join(dest_dylib_path, dylib_name)
+  args = ['mkdir', '-p', full_path]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', path, full_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
+  commands.append(args)
+  resources_dir = os.path.join(frameworks_dir, framework, "Resources")

-  args = ['mkdir', '-p', dest_dylib_path]
+  args = ['mkdir', resources_dir]
  commands.append(args)
-  args = ['ditto', '--arch=x86_64', source_dylib, dest_dylib_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(dest_dylib_path, parts[-1])]
-  commands.append(args)
-  args = ['ln', '-s', '5', os.path.join(dest_path, 'Versions', 'Current')]
-  commands.append(args)
-  args = ['ln', '-s', os.path.join('Versions', 'Current', dylib_name), os.path.join(dest_path, dylib_name)]
-  commands.append(args)
-  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Resources'), os.path.join(dest_path, 'Resources')]
-  commands.append(args)
-  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
+  args = ['chmod', 'u+w', resources_dir]
  commands.append(args)

-  return os.path.join(dest_dylib_path, dylib_name)
+  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
+  if not os.path.exists(info_plist):
+    info_plist = os.path.join(os.path.split(path)[0], 'Resources', 'Info.plist')
+  if os.path.exists(info_plist):
+    args = ['cp', '-r', info_plist, resources_dir]
+    commands.append(args)
+  return os.path.join(full_path, parts[-1])

 def FixId(path, library_name):
  id = '@executable_path/../Frameworks/%s' % library_name
@@ -9,9 +9,8 @@ team_identifier="$3"
 codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --deep "$src_app"

 # Verify the signature
-codesign -dv $src_app
-codesign --verify -v $src_app
 spctl -a -t exec -vv $src_app
+codesign -dv $src_app

 # Validate that the key used for signing the binary matches the expected TeamIdentifier
 # needed to pass the SocketApi through the sandbox
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#
-# This script creates a new windows toolchain repository in OBS.
-# It only works for versions that do not yet exist.
-#
-# Make sure to adopt the variable stableversion.
-
-# Set the new stable version accordingly:
-stableversion=2.1
-targetproject="isv:ownCloud:toolchains:mingw:win32:${stableversion}"
-
-# Create the new repo
-
-# get the xml build description of the stable repo
-xml=`osc meta prj isv:ownCloud:toolchains:mingw:win32:stable`
-stable_xml="${xml/stable/$stableversion}"
-
-echo $stable_xml
-
-echo $stable_xml | osc meta prj -F - ${targetproject}
-
-
-# now copy all packages
-packs=`osc ls isv:ownCloud:toolchains:mingw:win32:stable`
-
-for pack in $packs
-do
-    osc copypac isv:ownCloud:toolchains:mingw:win32:stable $pack $targetproject
-done
@@ -1,37 +0,0 @@
-FROM opensuse:42.1
-
-MAINTAINER Daniel Molkentin <danimo@owncloud.com>
-
-ENV TERM ansi
-ENV HOME /root
-
-ENV REFRESHED_AT 20160202
-
-RUN zypper --non-interactive --gpg-auto-import-keys refresh
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/isv:ownCloud:toolchains:mingw:win32:2.1/openSUSE_Leap_42.1/isv:ownCloud:toolchains:mingw:win32:2.1.repo
-RUN zypper --non-interactive --gpg-auto-import-keys install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
-                      mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                      mingw32-headers mingw32-runtime site-config mingw32-libwebp \
-                      mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5* \
-                      mingw32-qt5keychain* mingw32-angleproject* \
-                      mingw32-cross-nsis mingw32-libopenssl* \
-                      mingw32-sqlite* kdewin-png2ico \
-                      osslsigncode wget
-
-# RPM depends on curl for installs from HTTP
-RUN zypper --non-interactive --gpg-auto-import-keys install curl
-
-# sudo needed for building as user
-RUN zypper --non-interactive --gpg-auto-import-keys install sudo
-
-# Use packaged UAC dependencies
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess
-
-# Required for checksumming
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-zlib-devel
-
-# Required for windres not to crash
-RUN zypper --non-interactive --gpg-auto-import-keys install glibc-locale
-
-CMD /bin/bash
@@ -7,13 +7,13 @@ fi

 useradd user -u ${2:-1000}
 su - user << EOF
-  cd /home/user/$1
-  rm -rf build-win32
-  mkdir build-win32
-  cd build-win32
-  ../admin/win/download_runtimes.sh
-  cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
-  make -j4
-  make package
-  ctest .
+cd /home/user/$1
+rm -rf build-win32
+mkdir build-win32
+cd build-win32
+../admin/win/download_runtimes.sh
+cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
+make -j4
+make package
+ctest .
 EOF
@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\nDeseja que o instalador os termine automaticamente?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\\nDeseja que o instalador os 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."
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Ne odstrani namestitve"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Program je že nameščen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Izberite način namestitve programa ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novejša različica programa ${APPLICATION_NAME} je že nameščena! Ni priporočljivo namestiti starejše. V kolikor želite vseeno nadaljevati z namestitvijo, prej odstranite obstoječo različico. Izberite opravilo in pritisnite gumb za nadaljevanje."
-StrCpy $PageReinstall_SAME_Field_1 "Program ${APPLICATION_NAME} ${VERSION} je že nameščen.$\n$\nIzberite opravilo, ki ga želite izvesti in kliknite za nadaljevanje."
 StrCpy $PageReinstall_SAME_Field_2 "Dodaj/Ponovno namesti programe"
 StrCpy $PageReinstall_SAME_Field_3 "Odstrani ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odstrani ${APPLICATION_NAME}"
@@ -38,6 +37,7 @@ StrCpy $UAC_ERROR_ELEVATE "Ni mogo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Namestilnik zahteva skrbniška dovoljenja."
 StrCpy $INIT_INSTALLER_RUNNING "Namestilnik je že zagnan."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Program za odstranjevanje namestitve zahteva skrbniška dovoljenja."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Storitev za prijavo ni zagnana. Opravilo je ustavljeno!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Program za odstranjevanje namestitve je že zagnan."
 StrCpy $SectionGroup_Shortcuts "Bližnjice"
+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!"
@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\n$\"¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\\n$\"¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."
@@ -108,8 +108,7 @@ def escapeNSIS(st):
             .replace('\n', r'$\n')\
             .replace('\"', r'$\"')\
             .replace('$$\\', '$\\')\
-             .replace('$\\n', r'$\n')\
-             .replace('$\\\\n', r'$\n')
+             .replace('$\\n', r'$\n')


 translationCache = {}
@@ -317,7 +317,7 @@ typedef const char* (*csync_checksum_hook) (
 *
 * @param csync  The context variable to allocate.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_create(CSYNC **csync, const char *local, const char *remote);

@@ -328,7 +328,7 @@ int csync_create(CSYNC **csync, const char *local, const char *remote);
 *
 * @param ctx  The context to initialize.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_init(CSYNC *ctx);

@@ -337,7 +337,7 @@ int csync_init(CSYNC *ctx);
 *
 * @param ctx  The context to run the update detection on.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_update(CSYNC *ctx);

@@ -346,7 +346,7 @@ int csync_update(CSYNC *ctx);
 *
 * @param ctx  The context to run the reconciliation on.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_reconcile(CSYNC *ctx);

@@ -355,7 +355,7 @@ int csync_reconcile(CSYNC *ctx);
 *
 * @param ctx  The context to commit.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_commit(CSYNC *ctx);

@@ -366,7 +366,7 @@ int csync_commit(CSYNC *ctx);
 *
 * @param ctx  The context to destroy.
 *
- * @return  0 on success, less than 0 if an error occurred.
+ * @return  0 on success, less than 0 if an error occured.
 */
 int csync_destroy(CSYNC *ctx);

@@ -377,7 +377,7 @@ int csync_destroy(CSYNC *ctx);
 *
 * @param path          The path pointing to the file.
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_add_exclude_list(CSYNC *ctx, const char *path);

@@ -394,7 +394,7 @@ void csync_clear_exclude_list(CSYNC *ctx);
 * @param ctx           The csync context.
 *
 * @return              The userdata saved in the context, NULL if an error
- *                      occurred.
+ *                      occured.
 */
 void *csync_get_userdata(CSYNC *ctx);

@@ -406,7 +406,7 @@ void *csync_get_userdata(CSYNC *ctx);
 *
 * @param userdata      The userdata to be stored in the context.
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_set_userdata(CSYNC *ctx, void *userdata);

@@ -416,7 +416,7 @@ int csync_set_userdata(CSYNC *ctx, void *userdata);
 * @param ctx           The csync context.
 *
 * @return              The authentication callback set or NULL if an error
- *                      occurred.
+ *                      occured.
 */
 csync_auth_callback csync_get_auth_callback(CSYNC *ctx);

@@ -427,7 +427,7 @@ csync_auth_callback csync_get_auth_callback(CSYNC *ctx);
 *
 * @param cb            The authentication callback.
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);

@@ -436,7 +436,7 @@ int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);
 *
 * @param[in]  level  The log verbosity.
 *
- * @return 0 on success, < 0 if an error occurred.
+ * @return 0 on success, < 0 if an error occured.
 */
 int csync_set_log_level(int level);

@@ -451,7 +451,7 @@ int csync_get_log_level(void);
 * @brief Get the logging callback set.
 *
 * @return              The logging callback set or NULL if an error
- *                      occurred.
+ *                      occured.
 */
 csync_log_callback csync_get_log_callback(void);

@@ -460,7 +460,7 @@ csync_log_callback csync_get_log_callback(void);
 *
 * @param cb            The logging callback.
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_set_log_callback(csync_log_callback cb);

@@ -476,7 +476,7 @@ void *csync_get_log_userdata(void);
 *
 * @param[in]  data     The userdata to set.
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_set_log_userdata(void *data);

@@ -495,7 +495,7 @@ typedef int csync_treewalk_visit_func(TREE_WALK_FILE* ,void*);
 * @param visitor       A callback function to handle the file info.
 * @param filter        A filter, built from or'ed csync_instructions_e
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);

@@ -506,7 +506,7 @@ int csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int fi
 * @param visitor       A callback function to handle the file info.
 * @param filter        A filter, built from and'ed csync_instructions_e
 *
- * @return              0 on success, less than 0 if an error occurred.
+ * @return              0 on success, less than 0 if an error occured.
 */
 int csync_walk_remote_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);

@@ -47,45 +47,6 @@ int _csync_exclude_add(c_strlist_t **inList, const char *string) {
    return c_strlist_add_grow(inList, string);
 }

-/** Expands C-like escape sequences.
- *
- * The returned string is heap-allocated and owned by the caller.
- */
-static const char *csync_exclude_expand_escapes(const char * input)
-{
-    size_t i_len = strlen(input) + 1;
-    char *out = c_malloc(i_len); // out can only be shorter
-
-    size_t i = 0;
-    size_t o = 0;
-    for (; i < i_len; ++i) {
-        if (input[i] == '\\') {
-            // at worst input[i+1] is \0
-            switch (input[i+1]) {
-            case '\'': out[o++] = '\''; break;
-            case '"': out[o++] = '"'; break;
-            case '?': out[o++] = '?'; break;
-            case '\\': out[o++] = '\\'; break;
-            case 'a': out[o++] = '\a'; break;
-            case 'b': out[o++] = '\b'; break;
-            case 'f': out[o++] = '\f'; break;
-            case 'n': out[o++] = '\n'; break;
-            case 'r': out[o++] = '\r'; break;
-            case 't': out[o++] = '\t'; break;
-            case 'v': out[o++] = '\v'; break;
-            default:
-                out[o++] = input[i];
-                out[o++] = input[i+1];
-                break;
-            }
-            ++i;
-        } else {
-            out[o++] = input[i];
-        }
-    }
-    return out;
-}
-
 int csync_exclude_load(const char *fname, c_strlist_t **list) {
  int fd = -1;
  int i = 0;
@@ -138,10 +99,8 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
      if (entry != buf + i) {
        buf[i] = '\0';
        if (*entry != '#') {
-          const char *unescaped = csync_exclude_expand_escapes(entry);
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", unescaped);
-          rc = _csync_exclude_add(list, unescaped);
-          SAFE_FREE(unescaped);
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", entry);
+          rc = _csync_exclude_add(list, entry);
          if (rc < 0) {
              goto out;
          }
@@ -43,7 +43,7 @@ int _csync_exclude_add(c_strlist_t **inList, const char *string);
 * @param ctx    The context of the synchronizer.
 * @param fname  The filename to load.
 *
- * @return  0 on success, -1 if an error occurred with errno set.
+ * @return  0 on success, -1 if an error occured with errno set.
 */
 int csync_exclude_load(const char *fname, c_strlist_t **list);

@@ -54,7 +54,7 @@ int csync_get_statedb_exists(CSYNC *ctx);
 * @param ctx      The csync context.
 * @param statedb  Path to the statedb file (sqlite3 db).
 *
- * @return 0 on success, less than 0 if an error occurred with errno set.
+ * @return 0 on success, less than 0 if an error occured with errno set.
 */
 int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb);

@@ -106,42 +106,6 @@ static bool _last_db_return_error(CSYNC* ctx) {
    return ctx->statedb.lastReturnValue != SQLITE_OK && ctx->statedb.lastReturnValue != SQLITE_DONE && ctx->statedb.lastReturnValue != SQLITE_ROW;
 }

-/*
- * This static method is needed because the type members of the two structs use
- * different enum values. A direct comparion is not neccessarily correct.
- *
- * tmp is csync_file_stat_t
- * fs  is csync_vio_file_stat_t with this vio type:
- *  enum csync_vio_file_type_e {
- *              CSYNC_VIO_FILE_TYPE_UNKNOWN,
- *              CSYNC_VIO_FILE_TYPE_REGULAR,
- *              CSYNC_VIO_FILE_TYPE_DIRECTORY,
- *              CSYNC_VIO_FILE_TYPE_FIFO,
- *              CSYNC_VIO_FILE_TYPE_SOCKET,
- *              CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
- *              CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
- *              CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
- *            };
- *
- * csync_file_stat_t can be:
- * CSYNC_FTW_TYPE_SKIP, CSYNC_FTW_TYPE_FILE
- * CSYNC_FTW_TYPE_DIR, CSYNC_FTW_TYPE_SLINK
- */
-static bool _csync_filetype_different( const csync_file_stat_t *tmp, const csync_vio_file_stat_t *fs)
-{
-    if( !(tmp && fs)) return false;
-
-    if( tmp->type == CSYNC_FTW_TYPE_SKIP ) return true;
-
-    if( tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY )
-        return true;
-    if( tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR )
-        return true;
-    if( tmp->type == CSYNC_FTW_TYPE_SLINK && fs->type != CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK )
-        return true;
-
-    return false; // both are NOT different.
-}

 /* Return true if two mtime are considered equal
 * We consider mtime that are one hour difference to be equal if they are one hour appart
@@ -310,9 +274,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            st->instruction = CSYNC_INSTRUCTION_EVAL;

            // Preserve the EVAL flag later on if the type has changed.
-            if (_csync_filetype_different(tmp, fs)) {
+            if (tmp->type != fs->type)
                st->child_modified = 1;
-            }

            goto out;
        }
@@ -340,9 +303,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            }

            // Preserve the EVAL flag later on if the type has changed.
-            if (_csync_filetype_different(tmp, fs)) {
+            if (tmp->type != fs->type)
                st->child_modified = 1;
-            }

            st->instruction = CSYNC_INSTRUCTION_EVAL;
            goto out;
@@ -391,12 +353,10 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            }

            /* translate the file type between the two stat types csync has. */
-            if( tmp && tmp->type == CSYNC_FTW_TYPE_FILE ) {
+            if( tmp && tmp->type == 0 ) {
                tmp_vio_type = CSYNC_VIO_FILE_TYPE_REGULAR;
-            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_DIR) {
+            } else if( tmp && tmp->type == 2 ) {
                tmp_vio_type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
-            } else if( tmp && tmp->type == CSYNC_FTW_TYPE_SLINK ) {
-                tmp_vio_type = CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK;
            } else {
                tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
            }
@@ -429,7 +389,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                return -1;
            }
            if(tmp ) {                           /* tmp existing at all */
-                if ( _csync_filetype_different(tmp, fs)) {
+                if ((tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY) ||
+                        (tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR)) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: file types different is not!");
                    st->instruction = CSYNC_INSTRUCTION_NEW;
                    goto out;
@@ -820,9 +781,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
     * local stat function.
     */
    if( d_name[0] == '.' ) {
-        if (strcmp(".sys.admin#recall#", d_name) != 0) { /* recall file shall not be ignored (#4420) */
-            dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
-        }
+        dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
    }

    if( res == 0) {
@@ -136,7 +136,7 @@ struct c_rbnode_s {
 * @param data_compare  Callback function to compare a key as data with thee
 *                      data inside a red-black tree node.
 * 
- * @return              0 on success, -1 if an error occurred with errno set.
+ * @return              0 on success, -1 if an error occured with errno set.
 */
 int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_rbtree_compare_func *data_compare);

@@ -146,7 +146,7 @@ int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_r
 * @param tree Tree to duplicate.
 *
 * @return   Pointer to a new allocated duplicated rbtree. NULL if an error
- *           occurred.
+ *           occured.
 */
 c_rbtree_t *c_rbtree_dup(const c_rbtree_t *tree);

@@ -157,7 +157,7 @@ c_rbtree_t *c_rbtree_dup(const c_rbtree_t *tree);
 *
 * @param tree  The tree to free.
 *
- * @return   0 on success, less than 0 if an error occurred.
+ * @return   0 on success, less than 0 if an error occured.
 */
 int c_rbtree_free(c_rbtree_t *tree);

@@ -198,7 +198,7 @@ int c_rbtree_free(c_rbtree_t *tree);
 * @param data  The data to insert into the tree.
 *
 * @return  0 on success, 1 if a duplicate has been found and < 0 if an error
- *          occurred with errno set.
+ *          occured with errno set.
 *          EINVAL if a null pointer has been passed as the tree.
 *          ENOMEM if there is no memory left.
 */
@@ -223,7 +223,7 @@ c_rbnode_t *c_rbtree_find(c_rbtree_t *tree, const void *key);
 *
 * @param tree   The tree to get the head for.
 *
- * @return   The head node. NULL if an error occurred.
+ * @return   The head node. NULL if an error occured.
 */
 c_rbnode_t *c_rbtree_head(c_rbtree_t *tree);

@@ -232,7 +232,7 @@ c_rbnode_t *c_rbtree_head(c_rbtree_t *tree);
 *
 * @param tree   The tree to get the tail for.
 *
- * @return   The tail node. NULL if an error occurred.
+ * @return   The tail node. NULL if an error occured.
 */
 c_rbnode_t *c_rbtree_tail(c_rbtree_t *tree);

@@ -254,7 +254,7 @@ c_rbnode_t *c_rbtree_tail(c_rbtree_t *tree);
 * @param data     Data which should be passed to the visitor function.
 * @param visitor  Visitor function. This will be called for each node passed.
 *
- * @return   0 on sucess, less than 0 if an error occurred.
+ * @return   0 on sucess, less than 0 if an error occured.
 */
 int c_rbtree_walk(c_rbtree_t *tree, void *data, c_rbtree_visit_func *visitor);

@@ -263,7 +263,7 @@ int c_rbtree_walk(c_rbtree_t *tree, void *data, c_rbtree_visit_func *visitor);
 *
 * @param node  Node which should be deleted.
 *
- * @return  0 on success, -1 if an error occurred.
+ * @return  0 on success, -1 if an error occured.
 */
 int c_rbtree_node_delete(c_rbnode_t *node);

@@ -272,7 +272,7 @@ int c_rbtree_node_delete(c_rbnode_t *node);
 *
 * @param node  The node of which you want the next node.
 *
- * @return  The next node, NULL if an error occurred.
+ * @return  The next node, NULL if an error occured.
 */
 c_rbnode_t *c_rbtree_node_next(c_rbnode_t *node);

@@ -281,7 +281,7 @@ c_rbnode_t *c_rbtree_node_next(c_rbnode_t *node);
 *
 * @param node  The node of which you want the previous node.
 *
- * @return  The previous node, NULL if an error occurred.
+ * @return  The previous node, NULL if an error occured.
 */
 c_rbnode_t *c_rbtree_node_prev(c_rbnode_t *node);

@@ -290,7 +290,7 @@ c_rbnode_t *c_rbtree_node_prev(c_rbnode_t *node);
 *
 * @param N  The node to get the data from.
 *
- * @return  The data, NULL if an error occurred.
+ * @return  The data, NULL if an error occured.
 */
 #define c_rbtree_node_data(N) ((N) ? ((N)->data) : NULL)

@@ -301,7 +301,7 @@ c_rbnode_t *c_rbtree_node_prev(c_rbnode_t *node);
 *
 * @param tree  The tree to check.
 *
- * @return 0 on success, less than 0 if an error occurred.
+ * @return 0 on success, less than 0 if an error occured.
 */
 int c_rbtree_check_sanity(c_rbtree_t *tree);

@@ -346,25 +346,6 @@ static void check_csync_excluded_performance(void **state)
    }
 }

-static void check_csync_exclude_expand_escapes(void **state)
-{
-    (void)state;
-
-    const char *str = csync_exclude_expand_escapes(
-            "keep \\' \\\" \\? \\\\ \\a \\b \\f \\n \\r \\t \\v \\z");
-    assert_true(0 == strcmp(
-            str, "keep ' \" ? \\ \a \b \f \n \r \t \v \\z"));
-    SAFE_FREE(str);
-
-    str = csync_exclude_expand_escapes("");
-    assert_true(0 == strcmp(str, ""));
-    SAFE_FREE(str);
-
-    str = csync_exclude_expand_escapes("\\");
-    assert_true(0 == strcmp(str, "\\"));
-    SAFE_FREE(str);
-}
-
 int torture_run_tests(void)
 {
    const UnitTest tests[] = {
@@ -375,7 +356,6 @@ int torture_run_tests(void)
        unit_test_setup_teardown(check_csync_pathes, setup_init, teardown),
        unit_test_setup_teardown(check_csync_is_windows_reserved_word, setup_init, teardown),
        unit_test_setup_teardown(check_csync_excluded_performance, setup_init, teardown),
-        unit_test(check_csync_exclude_expand_escapes),
    };

    return run_tests(tests);
@@ -87,7 +87,7 @@ To manually override this key, use the same value in ``HKEY_CURRENT_USER``.

 To prevent automatic updates and disallow manual overrides:

-.. note:: This is the preferred method of controlling the updater behavior using 
+.. note::This is the preferred method of controlling the updater behavior using 
   Group Policies.

 1. Edit this Registry key:
@@ -98,14 +98,6 @@ To prevent automatic updates and disallow manual overrides:

 3. Specify a value of ``1`` to the machine.

-.. note:: Enterprise branded clients 
-   (see `Building Branded ownCloud Clients 
-   <https://doc.owncloud.org/branded_clients/>`_) have different key names, 
-   which are set in ownBrander using the Application Vendor and Application 
-   Name fields. Your key names look like this::
-
-   ``HKEY_LOCAL_MACHINE\Software\Policies\myCompanyName\myAppName``
-

 Preventing Automatic Updates in Mac OS X Environments
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -11,44 +11,25 @@ desktop client.
 .. note:: Build instructions are subject to change as development proceeds.
  Please check the version for which you want to build.

-These instructions are updated to work with version 2.1 of the ownCloud Client.
-
-Getting Source Code
-------------------
-
-The :ref:`generic-build-instructions` pull the latest code directly from 
-GitHub, and work on Linux, Mac OS X, and Windows.
-
-See the next section for instructions on getting source code from Linux 
-packages.
+The instructions contained in this topic were updated to work with version 1.7 of the ownCloud Client.

 Linux
 -----

-You may wish to use source packages for your Linux distribution, as these give 
-you the exact sources from which the binary packages are built. These are 
-hosted on the `ownCloud repository from OBS`_. Go to the `Index of 
-repositories`_ to see all the Linux client repos.
-
-1. At the `bottom of the page for each distribution 
-   <https://software.opensuse.org/download/package?project=isv:ownCloud:desktop&
-   package=owncloud-client>`_ is a "Grab binary packages directly" section. 
-   These contain source RPMs for CentOS, RHEL, Fedora, SLES, and openSUSE. 
-   
-   To get the .deb source packages add the source 
-   repo for your Debian or Ubuntu version, like this example for Debian 8 
-   (run as root)::
- 
-    echo 'deb-src 
-    http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Debian_8.0/ /' >> /etc/apt/sources.list.d/owncloud-client.list
-
-2. Install the dependencies using the following commands for your specific Linux distribution:
+1. Add the `ownCloud repository from OBS`_.
+2. Install the dependencies (as root, or using ``sudo``) using the following 
+   commands for your specific Linux distribution:
  
   * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
-   * openSUSE/SLES: ``zypper ref; zypper si -d owncloud-client``
-   * Fedora/CentOS/RHEL: ``yum install yum-utils; yum-builddep owncloud-client``
+   * openSUSE: ``zypper ref; zypper si -d owncloud-client``
+   * Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``

-3. Follow the :ref:`generic-build-instructions`, starting with step 2.
+3. Follow the :ref:`generic-build-instructions`.
+
+4. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
+
+.. note:: This step requires the ``mingw32-cross-nsis`` packages be installed on
+          Windows.

 Mac OS X
 --------
@@ -82,17 +63,15 @@ To set up your build environment for development using HomeBrew_:

 5. For compilation of the client, follow the :ref:`generic-build-instructions`.

-6. Install the Packages_ package creation tool.
-
-7. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
+6. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
   <install_dir>``. If you have a developer signing certificate, you can specify
   its Common Name as a third parameter (use quotes) to have the package
   signed automatically.

-   .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged
-             as a ``pkg`` installer. Do not call "make package" at any time when
-             compiling for OS X, as this will build a disk image, and will not
-             work correctly.
+.. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged
+          as a ``pkg`` installer. Do not call "make package" at any time when
+          compiling for OS X, as this will build a disk image, and will not
+          work correctly.

 Windows Development Build
 -----------------------
@@ -132,62 +111,64 @@ follow `Windows Installer Build (Cross-Compile)`_ instead.

 6. Create the build directory::

-     mkdir client-build
-     cd client-build
+    mkdir client-build
+    cd client-build

 7. Build the client::

-     cmake -G "MinGW Makefiles" ../client
-     mingw32-make
+    cmake -G "MinGW Makefiles" ../client
+    mingw32-make

-   .. note:: You can try using ninja to build in parallel using
-      ``cmake -G Ninja ../client`` and ``ninja`` instead.
-   .. note:: Refer to the :ref:`generic-build-instructions` section for additional options.
+  .. note:: You can try using ninja to build in parallel using
+     ``cmake -G Ninja ../client`` and ``ninja`` instead.
+  .. note:: Refer to the :ref:`generic-build-instructions` section for additional options.

-   The ownCloud binary will appear in the ``bin`` directory.
+  The ownCloud binary will appear in the ``bin`` directory.

 Windows Installer Build (Cross-Compile)
 ---------------------------------------

 Due to the large number of dependencies, building the client installer for Windows
 is **currently only officially supported on openSUSE**, by using the MinGW cross compiler.
-You can set up any currently supported version of openSUSE in a virtual machine if you do not
+You can set up openSUSE 13.1, 13.2 or openSUSE Factory in a virtual machine if you do not
 have it installed already.

-In order to make setup simple, you can use the provided Dockerfile to build your own image. 
+To cross-compile:

-1. Assuming you are in the root of the ownCloud Client's source tree, you can
-   build an image from this Dockerfile like this::
+1. Add the following repository using YaST or ``zypper ar`` (adjust when using another openSUSE version)::

-     cd admin/win32/docker
-     docker build . -t ownCloud-client-win32:<version>
+    zypper ar https://build.opensuse.org/project/show/isv:ownCloud:toolchains:mingw:win32:stable

-   Replace ``<version>`` by the version of the client you are building, e.g.
-   |version| for the release of the client that this document describes.
-   If you do not wish to use docker, you can run the commands in ``RUN`` manually
-   in a shell, e.g. to create your own build environment in a virtual machine.
+2. Install the cross-compiler packages and the cross-compiled dependencies::

-   .. note:: Docker images are specific to releases. This one refers to |version|.
-             Newer releases may have different dependencies, and thus require a later
-             version of the docker image! Always pick the docker image fitting your release
-             of ownCloud client!
+   zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+                mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
+                mingw32-headers mingw32-runtime site-config mingw32-libwebp \
+                mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5*

-2. From within the source tree Run the docker instance::
+3. For the installer, install the NSIS installer package::

-     docker run ownCloud-client-win32:<version> -v "$PWD:/home/jenkins/client" \
-                admin/win32/docker/build.sh $(id -u)
+    zypper install mingw32-cross-nsis mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess

-   It will run the build, create an NSIS based installer, as well as run tests.
-   You will find the resulting binary in an newly created ``build-win32`` subfolder.
+4. Follow the :ref:`generic-build-instructions`

-   If you do not wish to use docker, and ran the ``RUN`` commands above in a virtual machine,
-   you can run the indented commands in the lower section of ``build.sh`` manually in your
-   source tree.
+.. note:: When building for Windows platforms, you must specify a special
+     toolchain file that enables cmake to locate the platform-specific tools. To add
+     this parameter to the call to cmake, enter
+     ``-DCMAKE_TOOLCHAIN_FILE=../client/admin/win/Toolchain-mingw32-openSUSE.cmake``.

-4. Finally, you should sign the installer to avoid warnings upon installation.
-   This requires a `Microsoft Authenticode`_ Certificate ``osslsigncode`` to sign the installer::
+5. Build by running ``make``.

-     osslsigncode -pkcs12 $HOME/.codesign/packages.pfx -h sha256 \
+.. note:: Using ``make package`` produces an NSIS-based installer, provided
+    the NSIS mingw32 packages are installed.
+
+6. If you want to sign the installer, acquire a `Microsoft Authenticode`_ Certificate and install ``osslsigncode`` to sign the installer::
+
+    zypper install osslsigncode
+
+7. Sign the package::
+
+    osslsigncode -pkcs12 $HOME/.codesign/packages.pfx -h sha1 \
               -pass yourpass \
               -n "ACME Client" \
               -i "http://acme.com" \
@@ -198,7 +179,6 @@ In order to make setup simple, you can use the provided Dockerfile to build your
   for ``-in``, use the URL to the time stamping server provided by your CA along with the Authenticode certificate. Alternatively,
   you may use the official Microsoft ``signtool`` utility on Microsoft Windows.

-   If you're familiar with docker, you can use the version of ``osslsigncode`` that is part of the docker image.

 .. _generic-build-instructions:

@@ -209,36 +189,35 @@ Compared to previous versions, building the desktop sync client has become easie
 earlier versions, CSync, which is the sync engine library of the client, is now
 part of the client source repository and not a separate module.

-To build the most up-to-date version of the client:
+You can download the desktop sync client from the ownCloud `Client Download Page`_.

-1. Clone the latest versions of the client from Git_ as follows::
+To build the most up to date version of the client:

-     git clone git://github.com/owncloud/client.git
-     git submodule init
-     git submodule update
+1. Clone the latest versions of the client from Git_ as follows:

-2. Create the build directory::
+  ``git clone git://github.com/owncloud/client.git``
+  ``git submodule init``
+  ``git submodule update``

-     mkdir client-build
-     cd client-build
+2. Create the build directory:

-3. Configure the client build::
+  ``mkdir client-build``
+  ``cd client-build``

-     cmake -DCMAKE_BUILD_TYPE="Debug" ../client
+3. Configure the client build:

-   .. note:: You must use absolute paths for the ``include`` and ``library``
-            directories.
+  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../client``

-   .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
-            where ``target`` is a private location, i.e. in parallel to your build
-            dir by specifying ``../install``.
+  ..note:: You must use absolute paths for the ``include`` and ``library``
+           directories.
+
+  ..note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
+           where ``target`` is a private location, i.e. in parallel to your build
+           dir by specifying ``../install``.

 4. Call ``make``.

-   The owncloud binary will appear in the ``bin`` directory.
-   
-5. (Optional) Call ``make install`` to install the client to the   
-   ``/usr/local/bin`` directory.   
+  The owncloud binary will appear in the ``bin`` directory.

 The following are known cmake parameters:

@@ -251,17 +230,14 @@ The following are known cmake parameters:
 * ``BUILD_WITH_QT4=ON``: Builds using Qt4 (even if Qt5 is found).
 * ``CMAKE_INSTALL_PREFIX=path``: Set an install prefix. This is mandatory on Mac OS

-.. _ownCloud repository from OBS: http://software.opensuse.org/download/package? 
-   project=isv:ownCloud:desktop&package=owncloud-client
+.. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:desktop&package=owncloud-client
 .. _CMake: http://www.cmake.org/download
 .. _CSync: http://www.csync.org
-.. _Client Download Page: https://owncloud.org/install/#desktop
+.. _`Client Download Page`: http://owncloud.org/sync-clients/
 .. _Git: http://git-scm.com
 .. _MacPorts: http://www.macports.org
 .. _Homebrew: http://mxcl.github.com/homebrew/
-.. _OpenSSL Windows Build: http://slproweb.com/products/Win32OpenSSL.html
+.. _`OpenSSL Windows Build`: http://slproweb.com/products/Win32OpenSSL.html
 .. _Qt: http://www.qt.io/download
-.. _Microsoft Authenticode: https://msdn.microsoft.com/en-us/library/ie/ms537361%28v=vs.85%29.aspx
+.. _`Microsoft Authenticode`: https://msdn.microsoft.com/en-us/library/ie/ms537361%28v=vs.85%29.aspx
 .. _QtKeychain: https://github.com/frankosterfeld/qtkeychain
-.. _Packages: http://s.sudre.free.fr/Software/Packages/about.html
-.. _Index of repositories: http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/
@@ -288,5 +288,3 @@ epub_copyright = u'2013, The ownCloud developers'

 # Include todos?
 todo_include_todos = True
-
-rst_epilog =  '.. |version| replace:: %s' % version
@@ -22,16 +22,8 @@ Improvements and New Features
 The 2.1 release of the ownCloud desktop sync client has many new features and 
 improvements. (See the `complete changelog 
 <https://owncloud.org/changelog/desktop/>`_.)
- 
-  * Improved appearance on HiDPI screens
-  * Improved error messages
-  * Several fixes/improvements to the sharing dialog
-  * Several fixes/improvements to the server activity tab
-  * Allow changeable upload chunk size in owncloud.cfg
-  * Forget password on explicit sign-out
-  * Windows: Fix deleting and replacing of read-only files
+
  * Share with internal ownCloud users from your desktop
  * Separate views for server activity, sync activity, and errors
  * Don't re-upload *eml-files if size and checksum are unchanged
  * Improved upload/download progress indicator
-  
@@ -58,12 +58,11 @@ operations.
 This menu provides the following options:

 * Quick access to your accounts
-* Sync status
 * Recent Changes, showing latest activities
-* Settings
+* Status of your client version (whether it is up to date)
 * Help menu
 * An option to log in or log out of all of your accounts at once
-* Quit ownCloud, logging out and closing the client
+* Quit ownCloud

 A left-click on your systray icon opens the desktop client to the account 
 settings window.
@@ -83,7 +82,7 @@ have the following features:
 * Connection status, showing which ownCloud server you are connected to, and 
  your ownCloud username.
 * An **Account** button, which contains a dropdown menu with **Add New**, 
-  **Log In/Log Out**, and **Remove**.
+  **Sign In/Sign Out**, and **Remove**.
 * Used and available space on the server.
 * Current synchronization status.
 * **Add Folder Sync Connection** button, which is active only when you have 
@@ -125,12 +124,10 @@ button, and re-select the folder tree that you want to sync.
 Adding New Accounts
 ^^^^^^^^^^^^^^^^^^^

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

 Sharing From Your Desktop
@@ -209,12 +206,10 @@ can use the *Ignored Files Editor* (General tab.)

 .. figure:: images/ignored_files_editor.png

-For your convenience, the editor is pre-populated with a default list of 
-typical 
+For your convenience, the editor is pre-populated with a default list of typical 
 ignore patterns. These patterns are contained in a system file (typically 
 ``sync-exclude.lst``) located in the ownCloud Client application directory. You 
-cannot modify these pre-populated patterns directly from the editor. However, 
-if 
+cannot modify these pre-populated patterns directly from the editor. However, if 
 necessary, you can hover over any pattern in the list to show the path and 
 filename associated with that pattern, locate the file, and edit the 
 ``sync-exclude.lst`` file.
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# this script creates a plugin for nemo, just be replacing
-# all occurences of Nautilus with Nemo.
-
-sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py
@@ -3,4 +3,4 @@
 # this script replaces the line
 #  appname = 'ownCloud'
 # with the correct branding name in the syncstate.py script
-sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py
+/usr/bin/sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py
@@ -30,6 +30,7 @@ AccountState::AccountState(AccountPtr account)
    , _state(AccountState::Disconnected)
    , _connectionStatus(ConnectionValidator::Undefined)
    , _waitingForNewCredentials(false)
+    , _credentialsFetchMode(Interactive)
 {
    qRegisterMetaType<AccountState*>("AccountState*");

@@ -83,7 +84,7 @@ void AccountState::setState(State state)
            _connectionStatus = ConnectionValidator::Undefined;
            _connectionErrors.clear();
        } else if (oldState == SignedOut && _state == Disconnected) {
-            checkConnectivity();
+            checkConnectivity(Interactive);
        }
    }

@@ -144,7 +145,7 @@ void AccountState::tagLastSuccessfullETagRequest()
    _timeSinceLastETagCheck.restart();
 }

-void AccountState::checkConnectivity()
+void AccountState::checkConnectivity(CredentialFetchMode credentialsFetchMode)
 {
    if (isSignedOut() || _waitingForNewCredentials) {
        return;
@@ -166,6 +167,7 @@ void AccountState::checkConnectivity()
        return;
    }

+    _credentialsFetchMode = credentialsFetchMode;
    ConnectionValidator * conValidator = new ConnectionValidator(account());
    _connectionValidator = conValidator;
    connect(conValidator, SIGNAL(connectionResult(ConnectionValidator::Status,QStringList)),
@@ -259,7 +261,13 @@ void AccountState::slotCredentialsFetched(AbstractCredentials* credentials)
 {
    if (!credentials->ready()) {
        // No exiting credentials found in the keychain
-        credentials->askFromUser();
+        if (_credentialsFetchMode == Interactive)
+            credentials->askFromUser();
+        else {
+            Logger::instance()->postOptionalGuiLog(tr("Reauthentication required"), tr("You need to re-login to continue using the account %1.").arg(_account->displayName()));
+            setState(SignedOut);
+            _waitingForNewCredentials = false;
+        }
        return;
    }

@@ -269,7 +277,7 @@ void AccountState::slotCredentialsFetched(AbstractCredentials* credentials)
    // connection validation, even if it's currently running.
    delete _connectionValidator;

-    checkConnectivity();
+    checkConnectivity(_credentialsFetchMode);
 }

 void AccountState::slotCredentialsAsked(AbstractCredentials* credentials)
@@ -286,7 +294,7 @@ void AccountState::slotCredentialsAsked(AbstractCredentials* credentials)
    // connection validation, even if it's currently running.
    delete _connectionValidator;

-    checkConnectivity();
+    checkConnectivity(_credentialsFetchMode);
 }

 std::unique_ptr<QSettings> AccountState::settings()
@@ -59,6 +59,7 @@ public:
        /// An error like invalid credentials where retrying won't help.
        ConfigurationError
    };
+    enum CredentialFetchMode { Interactive, NonInteractive };

    /// The actual current connectivity status.
    typedef ConnectionValidator::Status ConnectionStatus;
@@ -90,7 +91,7 @@ public:

    /// Triggers a ping to the server to update state and
    /// connection status and errors.
-    void checkConnectivity();
+    void checkConnectivity(CredentialFetchMode credentialsFetchMode);

    /** Returns a new settings object for this account, already in the right groups. */
    std::unique_ptr<QSettings> settings();
@@ -126,6 +127,7 @@ private:
    ConnectionStatus _connectionStatus;
    QStringList _connectionErrors;
    bool _waitingForNewCredentials;
+    CredentialFetchMode _credentialsFetchMode;
    QElapsedTimer _timeSinceLastETagCheck;
    QPointer<ConnectionValidator> _connectionValidator;
 };
@@ -271,7 +271,7 @@ void Application::slotCheckConnection()
        // when the error is permanent.
        if (state != AccountState::SignedOut
                && state != AccountState::ConfigurationError) {
-            accountState->checkConnectivity();
+            accountState->checkConnectivity(AccountState::NonInteractive);
        }
    }

@@ -28,7 +28,6 @@
 #include "account.h"
 #include "theme.h"
 #include "cookiejar.h"
-#include "owncloudgui.h"
 #include "syncengine.h"

 #include <keychain.h>
@@ -270,7 +269,9 @@ void ShibbolethCredentials::slotReadJobDone(QKeychain::Job *job)
 void ShibbolethCredentials::showLoginWindow()
 {
    if (!_browser.isNull()) {
-        ownCloudGui::raiseDialog(_browser);
+        _browser->activateWindow();
+        _browser->raise();
+        // FIXME On OS X this does not raise properly
        return;
    }

@@ -285,7 +286,7 @@ void ShibbolethCredentials::showLoginWindow()
            this, SLOT(onShibbolethCookieReceived(QNetworkCookie)), Qt::QueuedConnection);
    connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));

-    ownCloudGui::raiseDialog(_browser);
+    _browser->show();
 }

 QList<QNetworkCookie> ShibbolethCredentials::accountCookies(Account* account)
@@ -57,7 +57,7 @@ QSize FolderStatusDelegate::sizeHint(const QStyleOptionViewItem & option ,

    auto classif = static_cast<const FolderStatusModel *>(index.model())->classify(index);
    if (classif == FolderStatusModel::AddButton) {
-        const int margins = aliasFm.height();  // same as 2*aliasMargin of paint
+        int margins = fm.height();
        QFontMetrics fm(option.font);
        QStyleOptionButton opt;
        static_cast<QStyleOption&>(opt) = option;
@@ -63,7 +63,7 @@ static void callback(
        qstring.resize(pathLength);
        CFStringGetCharacters(path, CFRangeMake(0, pathLength), reinterpret_cast<UniChar *>(qstring.data()));

-        paths.append(qstring.normalized(QString::NormalizationForm_C));
+        paths.append(qstring);
    }

    reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent(paths);
@@ -771,33 +771,12 @@ void ownCloudGui::slotShowShareDialog(const QString &sharePath, const QString &l

    const auto accountState = folder->accountState();

-    ShareDialog *w = 0;
-    if (_shareDialogs.contains(localPath) && _shareDialogs[localPath]) {
-        qDebug() << Q_FUNC_INFO << "Raising share dialog" << sharePath << localPath;
-        w = _shareDialogs[localPath];
-    } else {
-        qDebug() << Q_FUNC_INFO << "Opening share dialog" << sharePath << localPath;
-        w = new ShareDialog(accountState->account(), sharePath, localPath, resharingAllowed);
-        w->getShares();
-        w->setAttribute( Qt::WA_DeleteOnClose, true );
-
-        _shareDialogs[localPath] = w;
-        connect(w, SIGNAL(destroyed(QObject*)), SLOT(slotRemoveDestroyedShareDialogs()));
-    }
+    qDebug() << Q_FUNC_INFO << "Opening share dialog" << sharePath << localPath;
+    ShareDialog *w = new ShareDialog(accountState->account(), sharePath, localPath, resharingAllowed);
+    w->getShares();
+    w->setAttribute( Qt::WA_DeleteOnClose, true );
    raiseDialog(w);
 }

-void ownCloudGui::slotRemoveDestroyedShareDialogs()
-{
-    QMutableMapIterator<QString, QPointer<ShareDialog> > it(_shareDialogs);
-    while (it.hasNext()) {
-        it.next();
-        if (! it.value() || it.value() == sender()) {
-            it.remove();
-            qDebug() << "REMOVED";
-        }
-    }
-}
-

 } // end namespace
@@ -31,7 +31,6 @@ class Folder;

 class SettingsDialog;
 class SettingsDialogMac;
-class ShareDialog;
 class Application;
 class LogBrowser;
 class AccountState;
@@ -78,7 +77,6 @@ public slots:
    void slotOpenPath(const QString& path);
    void slotAccountStateChanged();
    void slotShowShareDialog(const QString &sharePath, const QString &localPath, bool resharingAllowed);
-    void slotRemoveDestroyedShareDialogs();

 private slots:
    void slotDisplayIdle();
@@ -101,7 +99,6 @@ private:
    QMenu *_recentActionsMenu;
    QVector<QMenu*> _accountMenus;
    bool _qdbusmenuWorkaround;
-    QMap<QString, QPointer<ShareDialog> > _shareDialogs;

    QAction *_actionLogin;
    QAction *_actionLogout;
@@ -249,7 +249,7 @@ void SelectiveSyncTreeView::slotLscolFinishedWithError(QNetworkReply *r)
    if (r->error() == QNetworkReply::ContentNotFoundError) {
        _loading->setText(tr("No subfolders currently on the server."));
    } else {
-        _loading->setText(tr("An error occurred while loading the list of sub folders."));
+        _loading->setText(tr("An error occured while loading the list of sub folders."));
    }
    _loading->resize(_loading->sizeHint()); // because it's not in a layout
 }
@@ -151,7 +151,7 @@ void LinkShare::setPassword(const QString &password)
 {
    OcsShareJob *job = new OcsShareJob(_account);
    connect(job, SIGNAL(shareJobFinished(QVariantMap, QVariant)), SLOT(slotPasswordSet(QVariantMap, QVariant)));
-    connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotSetPasswordError(int,QString)));
+    connect(job, SIGNAL(ocsError(int, QString)), SLOT(slotOcsError(int, QString)));
    job->setPassword(getId(), password);
 }

@@ -175,11 +175,6 @@ void LinkShare::slotExpireDateSet(const QVariantMap&, const QVariant &value)
    emit expireDateSet();
 }

-void LinkShare::slotSetPasswordError(int statusCode, const QString &message)
-{
-    emit passwordSetError(statusCode, message);
-}
-
 ShareManager::ShareManager(AccountPtr account, QObject *parent)
 : QObject(parent),
  _account(account)
@@ -206,7 +201,7 @@ void ShareManager::slotLinkShareCreated(const QVariantMap &reply)
     * meant that a share was password protected
     */
    if (code == 403) {
-        emit linkShareRequiresPassword(message);
+        emit linkShareRequiresPassword();
        return;
    } 

@@ -195,13 +195,11 @@ signals:
    void expireDateSet();
    void publicUploadSet();
    void passwordSet();
-    void passwordSetError(int statusCode, const QString &message);

 private slots:
    void slotPasswordSet(const QVariantMap&, const QVariant &value);
    void slotPublicUploadSet(const QVariantMap&, const QVariant &value);
    void slotExpireDateSet(const QVariantMap&, const QVariant &value);
-    void slotSetPasswordError(int statusCode, const QString &message);

 private:
    bool _passwordSet;
@@ -261,17 +259,10 @@ public:
 signals:
    void shareCreated(const QSharedPointer<Share> &share);
    void linkShareCreated(const QSharedPointer<LinkShare> &share);
+    void linkShareRequiresPassword();
    void sharesFetched(const QList<QSharedPointer<Share>> &shares);
    void serverError(int code, const QString &message);

-    /** Emitted when creating a link share with password fails.
-     *
-     * @param message the error message reported by the server
-     *
-     * See createLinkShare().
-     */
-    void linkShareRequiresPassword(const QString &message);
-
 private slots:
    void slotSharesFetched(const QVariantMap &reply);
    void slotLinkShareCreated(const QVariantMap &reply);
@@ -140,14 +140,13 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,

    connect(_manager, SIGNAL(sharesFetched(QList<QSharedPointer<Share>>)), SLOT(slotSharesFetched(QList<QSharedPointer<Share>>)));
    connect(_manager, SIGNAL(linkShareCreated(QSharedPointer<LinkShare>)), SLOT(slotCreateShareFetched(const QSharedPointer<LinkShare>)));
-    connect(_manager, SIGNAL(linkShareRequiresPassword(QString)), SLOT(slotCreateShareRequiresPassword(QString)));
-    connect(_manager, SIGNAL(serverError(int, QString)), SLOT(slotServerError(int,QString)));
+    connect(_manager, SIGNAL(linkShareRequiresPassword()), SLOT(slotCreateShareRequiresPassword()));
+    connect(_manager, SIGNAL(serverError(int, QString)), SLOT(displayError(int, QString)));
 }

 void ShareLinkWidget::setExpireDate(const QDate &date)
 {
    _pi_date->startAnimation();
-    _ui->errorLabel->hide();
    _share->setExpireDate(date);
 }

@@ -171,6 +170,8 @@ ShareLinkWidget::~ShareLinkWidget()
 void ShareLinkWidget::slotPasswordReturnPressed()
 {
    setPassword(_ui->lineEdit_password->text());
+    _ui->lineEdit_password->setText(QString());
+    _ui->lineEdit_password->setPlaceholderText(tr("Password Protected"));
    _ui->lineEdit_password->clearFocus();
 }

@@ -184,7 +185,6 @@ void ShareLinkWidget::setPassword(const QString &password)
 {
    _pi_link->startAnimation();
    _pi_password->startAnimation();
-    _ui->errorLabel->hide();

    _ui->checkBox_password->setEnabled(false);
    _ui->lineEdit_password->setEnabled(false);
@@ -199,9 +199,6 @@ void ShareLinkWidget::setPassword(const QString &password)

 void ShareLinkWidget::slotPasswordSet()
 {
-    _ui->lineEdit_password->setText(QString());
-    _ui->lineEdit_password->setPlaceholderText(tr("Password Protected"));
-
    /*
     * When setting/deleting a password from a share the old share is
     * deleted and a new one is created. So we need to refetch the shares
@@ -241,7 +238,6 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
                _ui->lineEdit_password->setEnabled(true);
                _ui->checkBox_password->setChecked(true);
                _ui->lineEdit_password->setPlaceholderText("********");
-                _ui->lineEdit_password->setText(QString());
                _ui->lineEdit_password->show();
                _ui->pushButton_setPassword->show();
            } else {
@@ -282,8 +278,7 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
            connect(_share.data(), SIGNAL(publicUploadSet()), SLOT(slotPublicUploadSet()));
            connect(_share.data(), SIGNAL(passwordSet()), SLOT(slotPasswordSet()));
            connect(_share.data(), SIGNAL(shareDeleted()), SLOT(slotDeleteShareFetched()));
-            connect(_share.data(), SIGNAL(serverError(int, QString)), SLOT(slotServerError(int,QString)));
-            connect(_share.data(), SIGNAL(passwordSetError(int, QString)), SLOT(slotPasswordSetError(int,QString)));
+            connect(_share.data(), SIGNAL(serverError(int, QString)), SLOT(displayError(int, QString)));

            break;
        }
@@ -363,11 +358,14 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
 {
    qDebug() << Q_FUNC_INFO <<( _ui->checkBox_shareLink->checkState() == Qt::Checked);
    if (_ui->checkBox_shareLink->checkState() == Qt::Checked) {
+        _pi_link->startAnimation();
+
        /*
         * Check the capabilities if the server requires a password for a share
         * Ask for it directly
         */
        if (_account->capabilities().sharePublicLinkEnforcePassword()) {
+            _pi_link->stopAnimation();
            _ui->checkBox_password->setChecked(true);
            _ui->checkBox_password->setEnabled(false);
            _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
@@ -381,9 +379,7 @@ void ShareLinkWidget::slotCheckBoxShareLinkClicked()
            return;
        }

-        _pi_link->startAnimation();
        _ui->checkBox_shareLink->setEnabled(false);
-        _ui->errorLabel->hide();
        _manager->createLinkShare(_sharePath);
    } else {

@@ -409,24 +405,18 @@ void ShareLinkWidget::slotCreateShareFetched(const QSharedPointer<LinkShare> sha
    getShares();
 }

-void ShareLinkWidget::slotCreateShareRequiresPassword(const QString& message)
+void ShareLinkWidget::slotCreateShareRequiresPassword()
 {
    // there needs to be a password
-    _pi_link->stopAnimation();
-    _pi_password->stopAnimation();
+    _pi_editing->stopAnimation();
    _ui->checkBox_password->setChecked(true);
    _ui->checkBox_password->setEnabled(false);
    _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
-    _ui->lineEdit_password->setEnabled(true);
    _ui->lineEdit_password->setFocus();
    _ui->pushButton_copy->hide();
    _ui->widget_shareLink->show();
    _ui->checkBox_expire->setEnabled(false);
    _ui->checkBox_editing->setEnabled(false);
-    if (!message.isEmpty()) {
-        _ui->errorLabel->setText(message);
-        _ui->errorLabel->show();
-    }

    _passwordRequired = true;

@@ -489,7 +479,6 @@ void ShareLinkWidget::setPublicUpload(bool publicUpload)
 {
    _ui->checkBox_editing->setEnabled(false);
    _pi_editing->startAnimation();
-    _ui->errorLabel->hide();

    _share->setPublicUpload(publicUpload);
 }
@@ -513,26 +502,13 @@ void ShareLinkWidget::setShareCheckBoxTitle(bool haveShares)

 }

-void ShareLinkWidget::slotServerError(int code, const QString &message)
+void ShareLinkWidget::displayError(int code, const QString &message)
 {
-    _pi_link->stopAnimation();
-    _pi_date->stopAnimation();
-    _pi_password->stopAnimation();
-    _pi_editing->stopAnimation();
-
+    const QString arg = QString("%1, %2").arg(code).arg(message);
    qDebug() << "Error from server" << code << message;
    displayError(message);
 }

-void ShareLinkWidget::slotPasswordSetError(int code, const QString &message)
-{
-    slotServerError(code, message);
-
-    _ui->checkBox_password->setEnabled(true);
-    _ui->lineEdit_password->setEnabled(true);
-    _ui->lineEdit_password->setFocus();
-}
-
 void ShareLinkWidget::displayError(const QString& errMsg)
 {
    _ui->errorLabel->setText( errMsg );
@@ -56,7 +56,7 @@ public:
 private slots:
    void slotSharesFetched(const QList<QSharedPointer<Share>> &shares);
    void slotCreateShareFetched(const QSharedPointer<LinkShare> share);
-    void slotCreateShareRequiresPassword(const QString& message);
+    void slotCreateShareRequiresPassword();
    void slotDeleteShareFetched();
    void slotPasswordSet();
    void slotExpireSet();
@@ -70,8 +70,7 @@ private slots:
    void slotCheckBoxEditingClicked();
    void slotPublicUploadSet();

-    void slotServerError(int code, const QString &message);
-    void slotPasswordSetError(int code, const QString &message);
+    void displayError(int code, const QString &message);

 private:
    void setShareCheckBoxTitle(bool haveShares);
@@ -545,7 +545,7 @@ SyncJournalFileRecord SocketApi::dbFileRecord_capi( Folder *folder, QString file
            rec._fileId  = query->baValue(4);
            rec._remotePerm = query->baValue(5);
        }
-        query->reset_and_clear_bindings();
+        query->reset();
    }
    return rec;
 }
@@ -67,16 +67,11 @@ set(libsync_SRCS
    creds/dummycredentials.cpp
    creds/abstractcredentials.cpp
    creds/credentialscommon.cpp
+    creds/httpcredentials.cpp
    ../3rdparty/qjson/json.cpp
    ../3rdparty/certificates/p12topem.cpp
 )

-if(TOKEN_AUTH_ONLY)
-    set (libsync_SRCS ${libsync_SRCS} creds/tokencredentials.cpp)
-else()
-    set (libsync_SRCS ${libsync_SRCS} creds/httpcredentials.cpp)
-endif()
-
 # These headers are installed for libowncloudsync to be used by 3rd party apps
 set(owncloudsync_HEADERS
    account.h
@@ -24,6 +24,10 @@
 #include "accessmanager.h"
 #include "utility.h"

+#include <QInputDialog>
+#include <QMutexLocker>
+#include <QApplication>
+
 namespace OCC
 {

@@ -173,7 +173,7 @@ void ConnectionValidator::checkAuthentication()
    job->setTimeout(timeoutToUseMsec);
    job->setProperties(QList<QByteArray>() << "getlastmodified");
    connect(job, SIGNAL(result(QVariantMap)), SLOT(slotAuthSuccess()));
-    connect(job, SIGNAL(finishedWithError(QNetworkReply*)), SLOT(slotAuthFailed(QNetworkReply*)));
+    connect(job, SIGNAL(networkError(QNetworkReply*)), SLOT(slotAuthFailed(QNetworkReply*)));
    job->start();
 }

@@ -17,6 +17,7 @@
 #include <QDebug>
 #include <QNetworkReply>
 #include <QSettings>
+#include <QInputDialog>

 #include <keychain.h>

@@ -121,17 +121,11 @@ bool TokenCredentials::ready() const
    return _ready;
 }

-void TokenCredentials::fetchFromKeychain()
+void TokenCredentials::fetch(FetchMode)
 {
    Q_EMIT fetched();
 }

-void TokenCredentials::askFromUser()
-{
-    emit asked();
-}
-
-
 bool TokenCredentials::stillValid(QNetworkReply *reply)
 {
    return ((reply->error() != QNetworkReply::AuthenticationRequiredError)
@@ -44,8 +44,7 @@ public:
    QString authType() const Q_DECL_OVERRIDE;
    QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;
    bool ready() const Q_DECL_OVERRIDE;
-    void askFromUser() Q_DECL_OVERRIDE;
-    void fetchFromKeychain() Q_DECL_OVERRIDE;
+    void fetch(FetchMode mode = Interactive) Q_DECL_OVERRIDE;
    bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE;
    void persist() Q_DECL_OVERRIDE;
    QString user() const Q_DECL_OVERRIDE;
@@ -325,6 +325,9 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
        if( slashPos > -1 ) {
            fileRef = file.midRef(slashPos+1);
        }
+        if( fileRef.startsWith(QChar('.')) ) {
+            file_stat->flags = CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        }
        //qDebug() << "!!!!" << file_stat << file_stat->name << file_stat->file_id << map.count();
        _results.append(file_stat);
    }
@@ -476,10 +476,9 @@ bool FileSystem::fileExists(const QString& filename, const QFileInfo& fileInfo)
 QString FileSystem::fileSystemForPath(const QString & path)
 {
    // See also QStorageInfo (Qt >=5.4) and GetVolumeInformationByHandleW (>= Vista)
-    QString drive = path.left(2);
-    if (! drive.endsWith(":"))
+    QString drive = path.left(3);
+    if (! drive.endsWith(":\\"))
        return QString();
-    drive.append('\\');

    const size_t fileSystemBufferSize = 4096;
    TCHAR fileSystemBuffer[fileSystemBufferSize];
@@ -558,7 +558,7 @@ bool PropfindJob::finished()
    } else {
        qDebug() << "PROPFIND request *not* successful, http result code is" << http_result_code
                 << (http_result_code == 302 ? reply()->header(QNetworkRequest::LocationHeader).toString()  : QLatin1String(""));
-        emit finishedWithError(reply());
+        emit finishedWithError();
    }
    return true;
 }
@@ -118,7 +118,7 @@ public:

 signals:
    void result(const QVariantMap &values);
-    void finishedWithError(QNetworkReply *reply = 0);
+    void finishedWithError();

 private slots:
    virtual bool finished() Q_DECL_OVERRIDE;
@@ -300,7 +300,8 @@ void SqlQuery::bindValue(int pos, const QVariant& value)
                res = sqlite3_bind_text16(_stmt, pos, str->utf16(),
                                          (str->size()) * sizeof(QChar), SQLITE_TRANSIENT);
            } else {
-                res = sqlite3_bind_null(_stmt, pos);
+                // unbound value create a null entry.
+                res = SQLITE_OK;
            }
            break; }
        default: {
@@ -364,10 +365,9 @@ void SqlQuery::finish()
    _stmt = 0;
 }

-void SqlQuery::reset_and_clear_bindings()
+void SqlQuery::reset()
 {
    SQLITE_DO(sqlite3_reset(_stmt));
-    SQLITE_DO(sqlite3_clear_bindings(_stmt));
 }

 } // namespace OCC
@@ -82,7 +82,7 @@ public:
    void bindValue(int pos, const QVariant& value);
    QString lastQuery() const;
    int numRowsAffected();
-    void reset_and_clear_bindings();
+    void reset();
    void finish();

 private:
@@ -543,20 +543,12 @@ void PropagateDownloadFileQNAM::slotGetFinished()
        return;
    }

-    if (_tmpFile.size() == 0 && _item->_size > 0) {
-        FileSystem::remove(_tmpFile.fileName());
-        done(SyncFileItem::NormalError,
-             tr("The downloaded file is empty despite the server announced it should have been %1.")
-                .arg(Utility::octetsToString(_item->_size)));
-        return;
-    }
-
    // Do checksum validation for the download. If there is no checksum header, the validator
-    // will also emit the validated() signal to continue the flow in slot transmissionChecksumValidated()
+    // will also emit the validated() signal to continue the flow in slot downloadFinished()
    // as this is (still) also correct.
    ValidateChecksumHeader *validator = new ValidateChecksumHeader(this);
    connect(validator, SIGNAL(validated(QByteArray,QByteArray)),
-            SLOT(transmissionChecksumValidated(QByteArray,QByteArray)));
+            SLOT(downloadFinished()));
    connect(validator, SIGNAL(validationFailed(QString)),
            SLOT(slotChecksumFail(QString)));
    auto checksumHeader = job->reply()->rawHeader(checkSumHeaderC);
@@ -644,35 +636,6 @@ static void handleRecallFile(const QString &fn)
 }
 } // end namespace

-void PropagateDownloadFileQNAM::transmissionChecksumValidated(const QByteArray &checksumType, const QByteArray &checksum)
-{
-    const auto theContentChecksumType = QByteArray("SHA1");
-
-    // Reuse transmission checksum as content checksum.
-    //
-    // We could do this more aggressively and accept both MD5 and SHA1
-    // instead of insisting on the exactly correct checksum type.
-    if (theContentChecksumType == checksumType || theContentChecksumType.isEmpty()) {
-        return contentChecksumComputed(checksumType, checksum);
-    }
-
-    // Compute the content checksum.
-    auto computeChecksum = new ComputeChecksum(this);
-    computeChecksum->setChecksumType(theContentChecksumType);
-
-    connect(computeChecksum, SIGNAL(done(QByteArray,QByteArray)),
-            SLOT(contentChecksumComputed(QByteArray,QByteArray)));
-    computeChecksum->start(_tmpFile.fileName());
-}
-
-void PropagateDownloadFileQNAM::contentChecksumComputed(const QByteArray &checksumType, const QByteArray &checksum)
-{
-    _item->_contentChecksum = checksum;
-    _item->_contentChecksumType = checksumType;
-
-    downloadFinished();
-}
-
 void PropagateDownloadFileQNAM::downloadFinished()
 {
    QString fn = _propagator->getFilePath(_item->_file);
@@ -128,8 +128,6 @@ public:
 private slots:
    void slotGetFinished();
    void abort() Q_DECL_OVERRIDE;
-    void transmissionChecksumValidated(const QByteArray& checksumType, const QByteArray& checksum);
-    void contentChecksumComputed(const QByteArray& checksumType, const QByteArray& checksum);
    void downloadFinished();
    void slotDownloadProgress(qint64,qint64);
    void slotChecksumFail( const QString& errMsg );
@@ -160,10 +160,6 @@ void PropagateRemoteMove::finalize()
    record._path = _item->_renameTarget;
    record._contentChecksum = oldRecord._contentChecksum;
    record._contentChecksumType = oldRecord._contentChecksumType;
-    if (record._fileSize != oldRecord._fileSize) {
-        qDebug() << "Warning: file sizes differ on server vs csync_journal: " << record._fileSize << oldRecord._fileSize;
-        record._fileSize = oldRecord._fileSize; // server might have claimed different size, we take the old one from the DB
-    }

    _propagator->_journal->setFileRecord(record);
    _propagator->_journal->commit("Remote Rename");
@@ -222,9 +222,8 @@ void PropagateUploadFileQNAM::slotComputeContentChecksum()
    QByteArray contentChecksumType;
    // We currently only do content checksums for the particular .eml case
    // This should be done more generally in the future!
-    if (filePath.endsWith(QLatin1String(".eml"), Qt::CaseInsensitive)
-            || filePath.endsWith(QLatin1String(".msg"), Qt::CaseInsensitive)) {
-        contentChecksumType = "SHA1";
+    if (filePath.endsWith(QLatin1String(".eml"), Qt::CaseInsensitive)) {
+        contentChecksumType = "MD5";
    }

    // Maybe the discovery already computed the checksum?
@@ -183,12 +183,6 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)

 }

-/**
- * Check if the item is in the blacklist.
- * If it should not be sync'ed because of the blacklist, update the item with the error instruction
- * and proper error message, and return true.
- * If the item is not in the blacklist, or the blacklist is stale, return false.
- */
 bool SyncEngine::checkErrorBlacklisting( SyncFileItem &item )
 {
    if( !_journal ) {
@@ -220,9 +214,6 @@ bool SyncEngine::checkErrorBlacklisting( SyncFileItem &item )
        } else if( item._modtime != entry._lastTryModtime ) {
            qDebug() << item._file << " is blacklisted, but has changed mtime!";
            return false;
-        } else if( item._renameTarget != entry._renameTarget) {
-            qDebug() << item._file << " is blacklisted, but rename target changed from" << entry._renameTarget;
-            return false;
        }
    } else if( item._direction == SyncFileItem::Down ) {
        // download, check the etag.
@@ -460,7 +451,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    }
    item->_size = file->size;

-    if (!item->_inode) {
+    if (!remote) {
        item->_inode = file->inode;
    }

@@ -503,8 +494,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
            // Even if the mtime is different on the server, we always want to keep the mtime from
            // the file system in the DB, this is to avoid spurious upload on the next sync
            item->_modtime = file->other.modtime;
-            // same for the size
-            item->_size = file->other.size;

            // If the 'W' remote permission changed, update the local filesystem
            SyncJournalFileRecord prev = _journal->getFileRecord(item->_file);
@@ -534,8 +523,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
                item->_isDirectory = isDirectory;
                _syncItemMap.insert(key, item);
            }
-            item->_isDirectory = isDirectory;
-            emit syncItemDiscovered(*item);
            return re;
        }
        break;
@@ -1053,17 +1040,8 @@ void SyncEngine::checkForPermission()
                    (*it)->_status = SyncFileItem::NormalError;
                    (*it)->_errorString = tr("Not allowed because you don't have permission to add subfolders to that folder");

-                    for (SyncFileItemVector::iterator it_next = it + 1; it_next != _syncedItems.end() && (*it_next)->destination().startsWith(path); ++it_next) {
+                    for (SyncFileItemVector::iterator it_next = it + 1; it_next != _syncedItems.end() && (*it_next)->_file.startsWith(path); ++it_next) {
                        it = it_next;
-                        if ((*it)->_instruction == CSYNC_INSTRUCTION_RENAME) {
-                            // The file was most likely moved in this directory.
-                            // If the file was read only or could not be moved or removed, it should
-                            // be restored. Do that in the next sync by not considering as a rename
-                            // but delete and upload. It will then be restored if needed.
-                            _journal->avoidRenamesOnNextSync((*it)->_file);
-                            _anotherSyncNeeded = true;
-                            qDebug() << "Moving of " << (*it)->_file << " canceled because no permission to add parent folder";
-                        }
                        (*it)->_instruction = CSYNC_INSTRUCTION_ERROR;
                        (*it)->_status = SyncFileItem::NormalError;
                        (*it)->_errorString = tr("Not allowed because you don't have permission to add parent folder");
@@ -1192,18 +1170,15 @@ void SyncEngine::checkForPermission()
                    }
                }

-#ifdef OWNCLOUD_RESTORE_RENAME /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
-                if (!sourceOK && (!destinationOK || isRename)
-                        // (not for directory because that's more complicated with the contents that needs to be adjusted)
-                        && !(*it)->_isDirectory) {
+#if 0 /* We don't like the idea of renaming behind user's back, as the user may be working with the files */
+
+                if (!sourceOK && !destinationOK) {
                    // Both the source and the destination won't allow move.  Move back to the original
                    std::swap((*it)->_file, (*it)->_renameTarget);
                    (*it)->_direction = SyncFileItem::Down;
                    (*it)->_errorString = tr("Move not allowed, item restored");
                    (*it)->_isRestoration = true;
                    qDebug() << "checkForPermission: MOVING BACK" << (*it)->_file;
-                    // in case something does wrong, we will not do it next time
-                    _journal->avoidRenamesOnNextSync((*it)->_file);
                } else
 #endif
                if (!sourceOK || !destinationOK) {
@@ -112,9 +112,8 @@ static QString defaultJournalMode(const QString & dbPath)
    // See #2693: Some exFAT file systems seem unable to cope with the
    // WAL journaling mode. They work fine with DELETE.
    QString fileSystem = FileSystem::fileSystemForPath(dbPath);
-    qDebug() << "Detected filesystem" << fileSystem << "for" << dbPath;
    if (fileSystem.contains("FAT")) {
-        qDebug() << "Filesystem contains FAT - using DELETE journal mode";
+        qDebug() << "Detected filesystem" << fileSystem << "- using DELETE journal mode";
        return "DELETE";
    }
 #else
@@ -409,7 +408,7 @@ bool SyncJournalDb::checkConnect()
    _deleteFileRecordRecursively.reset(new SqlQuery(_db));
    _deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')");

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

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

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

    return re;
 }
@@ -702,7 +685,7 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
        QString remotePerm (record._remotePerm);
        if (remotePerm.isEmpty()) remotePerm = QString(); // have NULL in DB (vs empty)
        int contentChecksumTypeId = mapChecksumType(record._contentChecksumType);
-        _setFileRecordQuery->reset_and_clear_bindings();
+        _setFileRecordQuery->reset();
        _setFileRecordQuery->bindValue(1, QString::number(phash));
        _setFileRecordQuery->bindValue(2, plen);
        _setFileRecordQuery->bindValue(3, record._path );
@@ -731,7 +714,7 @@ bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
                 << record._etag << record._fileId << record._remotePerm << record._fileSize << (record._serverHasIgnoredFiles ? 1:0)
                 << record._contentChecksum << record._contentChecksumType << contentChecksumTypeId;

-        _setFileRecordQuery->reset_and_clear_bindings();
+        _setFileRecordQuery->reset();
        return true;
    } else {
        qDebug() << "Failed to connect database.";
@@ -748,7 +731,7 @@ bool SyncJournalDb::deleteFileRecord(const QString& filename, bool recursively)
        // always delete the actual file.

        qlonglong phash = getPHash(filename);
-        _deleteFileRecordPhash->reset_and_clear_bindings();
+        _deleteFileRecordPhash->reset();
        _deleteFileRecordPhash->bindValue( 1, QString::number(phash) );

        if( !_deleteFileRecordPhash->exec() ) {
@@ -758,9 +741,9 @@ bool SyncJournalDb::deleteFileRecord(const QString& filename, bool recursively)
            return false;
        }
        qDebug() <<  _deleteFileRecordPhash->lastQuery() << phash << filename;
-        _deleteFileRecordPhash->reset_and_clear_bindings();
+        _deleteFileRecordPhash->reset();
        if( recursively) {
-            _deleteFileRecordRecursively->reset_and_clear_bindings();
+            _deleteFileRecordRecursively->reset();
            _deleteFileRecordRecursively->bindValue(1, filename);
            if( !_deleteFileRecordRecursively->exec() ) {
                qWarning() << "Exec error of SQL statement: "
@@ -769,7 +752,7 @@ bool SyncJournalDb::deleteFileRecord(const QString& filename, bool recursively)
                return false;
            }
            qDebug() <<  _deleteFileRecordRecursively->lastQuery()  << filename;
-            _deleteFileRecordRecursively->reset_and_clear_bindings();
+            _deleteFileRecordRecursively->reset();
        }
        return true;
    } else {
@@ -787,7 +770,7 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
    SyncJournalFileRecord rec;

    if( checkConnect() ) {
-        _getFileRecordQuery->reset_and_clear_bindings();
+        _getFileRecordQuery->reset();
        _getFileRecordQuery->bindValue(1, QString::number(phash));

        if (!_getFileRecordQuery->exec()) {
@@ -817,7 +800,7 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
            QString err = _getFileRecordQuery->error();
            qDebug() << "No journal entry found for " << filename;
        }
-        _getFileRecordQuery->reset_and_clear_bindings();
+        _getFileRecordQuery->reset();
    }
    return rec;
 }
@@ -916,7 +899,7 @@ bool SyncJournalDb::updateFileRecordChecksum(const QString& filename,
    int checksumTypeId = mapChecksumType(contentChecksumType);
    auto & query = _setFileRecordChecksumQuery;

-    query->reset_and_clear_bindings();
+    query->reset();
    query->bindValue(1, QString::number(phash));
    query->bindValue(2, contentChecksum);
    query->bindValue(3, checksumTypeId);
@@ -931,7 +914,7 @@ bool SyncJournalDb::updateFileRecordChecksum(const QString& filename,
    qDebug() << query->lastQuery() << phash << contentChecksum
             << contentChecksumType << checksumTypeId;

-    query->reset_and_clear_bindings();
+    query->reset();
    return true;
 }

@@ -973,7 +956,7 @@ static bool deleteBatch(SqlQuery & query, const QStringList & entries, const QSt
    qDebug() << "Removing stale " << qPrintable(name) << " entries: " << entries.join(", ");
    // FIXME: Was ported from execBatch, check if correct!
    foreach( const QString& entry, entries ) {
-        query.reset_and_clear_bindings();
+        query.reset();
        query.bindValue(1, entry);
        if (!query.exec()) {
            QString err = query.error();
@@ -982,7 +965,7 @@ static bool deleteBatch(SqlQuery & query, const QStringList & entries, const QSt
            return false;
        }
    }
-    query.reset_and_clear_bindings(); // viel hilft viel ;-)
+    query.reset(); // viel hilft viel ;-)

    return true;
 }
@@ -994,7 +977,7 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString& file)
    DownloadInfo res;

    if( checkConnect() ) {
-        _getDownloadInfoQuery->reset_and_clear_bindings();
+        _getDownloadInfoQuery->reset();
        _getDownloadInfoQuery->bindValue(1, file);

        if (!_getDownloadInfoQuery->exec()) {
@@ -1008,7 +991,7 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString& file)
        } else {
            res._valid = false;
        }
-        _getDownloadInfoQuery->reset_and_clear_bindings();
+        _getDownloadInfoQuery->reset();
    }
    return res;
 }
@@ -1022,7 +1005,7 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
    }

    if (i._valid) {
-        _setDownloadInfoQuery->reset_and_clear_bindings();
+        _setDownloadInfoQuery->reset();
        _setDownloadInfoQuery->bindValue(1, file);
        _setDownloadInfoQuery->bindValue(2, i._tmpfile);
        _setDownloadInfoQuery->bindValue(3, i._etag );
@@ -1034,10 +1017,10 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
        }

        qDebug() <<  _setDownloadInfoQuery->lastQuery() << file << i._tmpfile << i._etag << i._errorCount;
-        _setDownloadInfoQuery->reset_and_clear_bindings();
+        _setDownloadInfoQuery->reset();

    } else {
-        _deleteDownloadInfoQuery->reset_and_clear_bindings();
+        _deleteDownloadInfoQuery->reset();
        _deleteDownloadInfoQuery->bindValue( 1, file );

        if( !_deleteDownloadInfoQuery->exec() ) {
@@ -1045,7 +1028,7 @@ void SyncJournalDb::setDownloadInfo(const QString& file, const SyncJournalDb::Do
            return;
        }
        qDebug() <<  _deleteDownloadInfoQuery->lastQuery()  << file;
-        _deleteDownloadInfoQuery->reset_and_clear_bindings();
+        _deleteDownloadInfoQuery->reset();
    }
 }

@@ -1113,7 +1096,7 @@ SyncJournalDb::UploadInfo SyncJournalDb::getUploadInfo(const QString& file)

    if( checkConnect() ) {

-        _getUploadInfoQuery->reset_and_clear_bindings();
+        _getUploadInfoQuery->reset();
        _getUploadInfoQuery->bindValue(1, file);

        if (!_getUploadInfoQuery->exec()) {
@@ -1131,7 +1114,7 @@ SyncJournalDb::UploadInfo SyncJournalDb::getUploadInfo(const QString& file)
            res._modtime    = Utility::qDateTimeFromTime_t(_getUploadInfoQuery->int64Value(4));
            res._valid      = ok;
        }
-        _getUploadInfoQuery->reset_and_clear_bindings();
+        _getUploadInfoQuery->reset();
    }
    return res;
 }
@@ -1145,7 +1128,7 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
    }

    if (i._valid) {
-        _setUploadInfoQuery->reset_and_clear_bindings();
+        _setUploadInfoQuery->reset();
        _setUploadInfoQuery->bindValue(1, file);
        _setUploadInfoQuery->bindValue(2, i._chunk);
        _setUploadInfoQuery->bindValue(3, i._transferid );
@@ -1159,9 +1142,9 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
        }

        qDebug() <<  _setUploadInfoQuery->lastQuery() << file << i._chunk << i._transferid << i._errorCount;
-        _setUploadInfoQuery->reset_and_clear_bindings();
+        _setUploadInfoQuery->reset();
    } else {
-        _deleteUploadInfoQuery->reset_and_clear_bindings();
+        _deleteUploadInfoQuery->reset();
        _deleteUploadInfoQuery->bindValue(1, file);

        if( !_deleteUploadInfoQuery->exec() ) {
@@ -1169,7 +1152,7 @@ void SyncJournalDb::setUploadInfo(const QString& file, const SyncJournalDb::Uplo
            return;
        }
        qDebug() <<  _deleteUploadInfoQuery->lastQuery() << file;
-        _deleteUploadInfoQuery->reset_and_clear_bindings();
+        _deleteUploadInfoQuery->reset();
    }
 }

@@ -1212,7 +1195,7 @@ SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry( const QStrin
    // SELECT lastTryEtag, lastTryModtime, retrycount, errorstring

    if( checkConnect() ) {
-        _getErrorBlacklistQuery->reset_and_clear_bindings();
+        _getErrorBlacklistQuery->reset();
        _getErrorBlacklistQuery->bindValue( 1, file );
        if( _getErrorBlacklistQuery->exec() ){
            if( _getErrorBlacklistQuery->next() ) {
@@ -1222,10 +1205,9 @@ SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry( const QStrin
                entry._errorString    = _getErrorBlacklistQuery->stringValue(3);
                entry._lastTryTime    = _getErrorBlacklistQuery->int64Value(4);
                entry._ignoreDuration = _getErrorBlacklistQuery->int64Value(5);
-                entry._renameTarget   = _getErrorBlacklistQuery->stringValue(6);
                entry._file           = file;
            }
-            _getErrorBlacklistQuery->reset_and_clear_bindings();
+            _getErrorBlacklistQuery->reset();
        } else {
            qWarning() << "Exec error blacklist: " << _getErrorBlacklistQuery->lastQuery() <<  " : "
                       << _getErrorBlacklistQuery->error();
@@ -1334,15 +1316,14 @@ void SyncJournalDb::updateErrorBlacklistEntry( const SyncJournalErrorBlacklistRe
    _setErrorBlacklistQuery->bindValue(5, item._errorString);
    _setErrorBlacklistQuery->bindValue(6, QString::number(item._lastTryTime));
    _setErrorBlacklistQuery->bindValue(7, QString::number(item._ignoreDuration));
-    _setErrorBlacklistQuery->bindValue(8, item._renameTarget);
    if( !_setErrorBlacklistQuery->exec() ) {
        QString bug = _setErrorBlacklistQuery->error();
        qDebug() << "SQL exec blacklistitem insert or replace failed: "<< bug;
    }
    qDebug() << "set blacklist entry for " << item._file << item._retryCount
             << item._errorString << item._lastTryTime << item._ignoreDuration
-             << item._lastTryModtime << item._lastTryEtag << item._renameTarget ;
-    _setErrorBlacklistQuery->reset_and_clear_bindings();
+             << item._lastTryModtime << item._lastTryEtag;
+    _setErrorBlacklistQuery->reset();

 }

@@ -1413,7 +1394,7 @@ QStringList SyncJournalDb::getSelectiveSyncList(SyncJournalDb::SelectiveSyncList
        return result;
    }

-    _getSelectiveSyncListQuery->reset_and_clear_bindings();
+    _getSelectiveSyncListQuery->reset();
    _getSelectiveSyncListQuery->bindValue(1, int(type));
    if (!_getSelectiveSyncListQuery->exec()) {
        qWarning() << "SQL query failed: "<< _getSelectiveSyncListQuery->error();
@@ -1445,7 +1426,7 @@ void SyncJournalDb::setSelectiveSyncList(SyncJournalDb::SelectiveSyncListType ty

    SqlQuery insQuery("INSERT INTO selectivesync VALUES (?1, ?2)" , _db);
    foreach(const auto &path, list) {
-        insQuery.reset_and_clear_bindings();
+        insQuery.reset();
        insQuery.bindValue(1, path);
        insQuery.bindValue(2, int(type));
        if (!insQuery.exec()) {
@@ -1537,7 +1518,7 @@ QByteArray SyncJournalDb::getChecksumType(int checksumTypeId)

    // Retrieve the id
    auto & query = *_getChecksumTypeQuery;
-    query.reset_and_clear_bindings();
+    query.reset();
    query.bindValue(1, checksumTypeId);
    if( !query.exec() ) {
        qWarning() << "Error SQL statement getChecksumType: "
@@ -1560,7 +1541,7 @@ int SyncJournalDb::mapChecksumType(const QByteArray& checksumType)
    }

    // Ensure the checksum type is in the db
-    _insertChecksumTypeQuery->reset_and_clear_bindings();
+    _insertChecksumTypeQuery->reset();
    _insertChecksumTypeQuery->bindValue(1, checksumType);
    if( !_insertChecksumTypeQuery->exec() ) {
        qWarning() << "Error SQL statement insertChecksumType: "
@@ -1570,7 +1551,7 @@ int SyncJournalDb::mapChecksumType(const QByteArray& checksumType)
    }

    // Retrieve the id
-    _getChecksumTypeIdQuery->reset_and_clear_bindings();
+    _getChecksumTypeIdQuery->reset();
    _getChecksumTypeIdQuery->bindValue(1, checksumType);
    if( !_getChecksumTypeIdQuery->exec() ) {
        qWarning() << "Error SQL statement getChecksumTypeId: "
@@ -151,7 +151,6 @@ SyncJournalErrorBlacklistRecord SyncJournalErrorBlacklistRecord::update(
    // The factor of 5 feels natural: 25s, 2 min, 10 min, ~1h, ~5h, ~24h
    entry._ignoreDuration = old._ignoreDuration * 5;
    entry._file = item._file;
-    entry._renameTarget = item._renameTarget;

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

    QString    _file;
-    QString    _renameTarget;

    bool isValid() const;

@@ -161,7 +161,7 @@ QByteArray Utility::userAgentString()
 {
    QString re = QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2")
            .arg(platform())
-            .arg(QLatin1String(MIRALL_VERSION_STRING));
+            .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION)));

    QLatin1String appName(APPLICATION_SHORTNAME);

@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>S&apos;ha desconnectat</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconnectat</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Connectat</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servei no disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Error de xarxa</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Error de configuració</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estat del compte desconegut</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Es requereix nova acreditació</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Aturat per l&apos;usuari</translation>
    </message>
@@ -2319,29 +2329,29 @@ No és aconsellada usar-la.</translation>
        <translation>Protegit amb contr&amp;asenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protegit amb contrasenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>El fitxer no es pot compartir perquè va ser compartit sense permisos de compartició.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Establiu la contrasenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Com&amp;parteix l&apos;enllaç</translation>
    </message>
@@ -2410,12 +2420,12 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Error d&apos;accés</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Cal identificar-se com a usuari %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Odhlášeno</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Odpojeno</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Připojeno</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Služba nedostupná</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Chyba sítě</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Chyba konfigurace</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Neznámý stav účtu</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Vyžadováno opětovné ověření</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Je třeba abyste se znovu přihlásili pro další používání účtu %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Zrušeno uživatelem</translation>
    </message>
@@ -2328,29 +2338,29 @@ Nedoporučuje se jí používat.</translation>
        <translation>Ch&amp;ránit heslem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Chráněno heslem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Nastavte prosím heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Sdílet odkaz</translation>
    </message>
@@ -2419,12 +2429,12 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Chyba přihlášení</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Musíte se přihlásit jako uživatel %1</translation>
    </message>
@@ -3335,7 +3345,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/application.cpp" line="571"/>
        <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -278,40 +278,50 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Abgemeldet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Getrennt</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Verbunden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Dienst nicht verfügbar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Netzwerkfehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Konfigurationsfehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Unbekannten Konto-Zustand</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Erneute Authentifizierung erforderlich</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Sie müssen sich zur weiteren Nutzung des Kontos %1 neu anmelden.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -518,7 +528,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
@@ -2326,29 +2336,29 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Passwort geschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>passwortgeschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Bitte wählen Sie ein Passwort:</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Link teilen</translation>
    </message>
@@ -2368,7 +2378,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
        <source>No results for &apos;%1&apos;</source>
-        <translation>Keine Ergebnisse für &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2417,12 +2427,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Log-In Fehler</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Sie müssen sich als %1 einloggen</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Αποσύνδεση</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Αποσυνδεδεμένο</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Συνδεδεμένο</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Σφάλμα δικτύου</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Σφάλμα ρυθμίσεων</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Άγνωστη κατάσταση λογαριασμού</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Απαιτείται επανάληψη πιστοποίησης</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Θα πρέπει να συνδεθείτε ξανά για να συνεχίσετε να χρησιμοποιείτε το λογαριασμό %1</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
@@ -2329,29 +2339,29 @@ It is not advisable to use it.</source>
        <translation>Π&amp;ροστασία με κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Προστατευμένο με κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Ο δημόσιος &amp;διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Παρακαλούμε ορίστε Κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Δ&amp;ιαμοιρασμός συνδέσμου</translation>
    </message>
@@ -2420,12 +2430,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Σφάλμα Σύνδεσης</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Πρέπει να εισέλθετε σαν χρήστης %1</translation>
    </message>
@@ -279,40 +279,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -519,7 +529,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2321,29 +2331,29 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2412,12 +2422,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"></translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Cerrar sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servicio no disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Error en la red</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Error en la configuración</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estado de cuenta desconocido</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Debe volver a autenticarse</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Debe volver a identificarse para continuar usando la cuenta %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
@@ -2324,29 +2334,29 @@ No se recomienda usarla.</translation>
        <translation>Protegido por contr&amp;aseña </translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protegido con contraseña</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Por favor establece una contraseña</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Compartir enlace</translation>
    </message>
@@ -2415,12 +2425,12 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Error al iniciar sesión</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Debe iniciar sesión como el usuario %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Desautentificado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servicio no disponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Error de red</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Error de configuración</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estado de la cuenta desconocido</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
@@ -2310,29 +2320,29 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2401,12 +2411,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Välja logitud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Lahti ühendatud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Ühendatud</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Teenus pole saadaval</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Võrgu viga</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Seadistamise tõrge</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Tundmatu konto olek</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Vajalik on uuesti autentimine</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
@@ -2312,29 +2322,29 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>P&amp;arooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Parooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Palun määra parool</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaga linki</translation>
    </message>
@@ -2403,12 +2413,12 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Sisselogimise viga</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Pead sisse logima kui kasutaja %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Saioa bukatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Deskonektatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Konektatuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Zerbitzua ez dago eskuragarri</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Sare errorea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Konfigurazio errorea</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Kontuaren egoera ezezaguna</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Berautentikatzea beharrezkoa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Saioa hasi behar duzu berriro %1 kontua erabiltzen jarraitzeko.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
@@ -2318,29 +2328,29 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Mesedez Ezarri Pasahitza</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2409,12 +2419,12 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Errorea sartzean</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
@@ -2855,7 +2865,7 @@ Ez da gomendagarria erabltzea.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="826"/>
        <source>File name contains at least one invalid character</source>
-        <translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1015"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>خارج شد</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>متصل</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>سرویس خارج از دسترس</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>خطای شبکه</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation type="unfinished"/>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>متوقف شده توسط کاربر</translation>
    </message>
@@ -2311,29 +2321,29 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>محافظت شده توسط رمزعبور</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>لطفا رمزعبور را تعیین کنید</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;اشتراک‌گذاری لینک</translation>
    </message>
@@ -2402,12 +2412,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>خطای ورود</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation type="unfinished"/>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Kirjauduttu ulos</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Yhteys katkaistu</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Yhdistetty</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Palvelu ei ole käytettävissä</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Verkkovirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Asetusvirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Tuntematon tilin tila</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Tunnistaudu uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Kirjaudu uudelleen, jotta voit jatkaa tilin %1 käyttämistä.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
@@ -2319,29 +2329,29 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation>&amp;Suojaa salasanalla</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Salasanasuojattu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Aseta salasana</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Jaa linkki</translation>
    </message>
@@ -2361,7 +2371,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
        <source>No results for &apos;%1&apos;</source>
-        <translation>Ei tuloksia haulla &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2410,12 +2420,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Kirjautumisvirhe</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Sinun tulee kirjautua käyttäjänä %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Session fermée</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Déconnecté</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Connecté</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Service indisponible</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Erreur réseau</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Erreur de configuration</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Etat du compte inconnu</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Nouvelle authentification nécessaire</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Vous devez vous identifier à nouveau pour continuer d&apos;utiliser le compte %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -340,7 +350,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="419"/>
        <source>List of ignored or erroneous files</source>
-        <translation>Liste des fichiers ignorés ou en erreur</translation>
+        <translation>Liste de fichiers ignorés ou erronés</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="423"/>
@@ -355,7 +365,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="429"/>
        <source>Not Synced</source>
-        <translation>Fichiers non synchronisés</translation>
+        <translation>Non Synchronisé</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="450"/>
@@ -370,7 +380,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="457"/>
        <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation>La liste des éléments non synchronisés a été copiée dans le presse-papier.</translation>
+        <translation>La liste d&apos;objets non synchronisé a été copié dans le presse papier.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="462"/>
@@ -394,7 +404,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="313"/>
        <source>Server Activities</source>
-        <translation>Activités Serveur</translation>
+        <translation>Activités du Serveur</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="286"/>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Interrompu par l&apos;utilisateur</translation>
    </message>
@@ -1103,17 +1113,17 @@ Temps restant total %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="33"/>
        <source>Show &amp;Desktop Notifications</source>
-        <translation>Afficher les notifications sur le &amp;bureau</translation>
+        <translation>Afficher les notifications du &amp;Bureau</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="43"/>
        <source>Use &amp;Monochrome Icons</source>
-        <translation>Utiliser les icônes &amp;monochromes</translation>
+        <translation>Utiliser les Icônes &amp;Monochromes</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="59"/>
        <source>Edit &amp;Ignored Files</source>
-        <translation>Éditer les fichiers &amp;ignorés</translation>
+        <translation>Éditer les Fichiers &amp;ignorés</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="81"/>
@@ -1123,7 +1133,7 @@ Temps restant total %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="129"/>
        <source>S&amp;how crash reporter</source>
-        <translation>Affic&amp;her le rapport d&apos;incident</translation>
+        <translation>A&amp;fficher le rapport d&apos;incident</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="156"/>
@@ -1457,7 +1467,7 @@ Les éléments dont la suppression automatique est permise seront supprimés s&a
    <message>
        <location filename="../src/gui/networksettings.cpp" line="128"/>
        <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation>Qt &gt;= 5.4 est requis pour utiliser la limite de bande passante</translation>
+        <translation>Qt &gt;= 5.4 est requis pour pouvoir utiliser la limite de bande passante</translation>
    </message>
 </context>
 <context>
@@ -1492,7 +1502,7 @@ L&apos;assistant peut demander des privilèges additionnels durant le processus.
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
        <source>%1 version %2 available. Restart application to start the update.</source>
-        <translation>%1 version %2 disponible. Redémarrez l&apos;application pour commencer la mise à jour.</translation>
+        <translation>%1 version %2 disponible. Redémarrez l&apos;application pour démarrer la mise à jour.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
@@ -2300,7 +2310,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
        <source>Set &amp;password </source>
-        <translation>Enregistrer le mot de &amp;passe</translation>
+        <translation>Définir le mot de &amp;passe</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
@@ -2328,31 +2338,31 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Protéger par mot de p&amp;asse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
-        <translation>Protégé par mot de passe</translation>
+        <translation>Protégé par un mot de passe</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Veuillez choisir un mot de passe</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
-        <translation>Partager par &amp;lien public</translation>
+        <translation>&amp;Partager par lien public</translation>
    </message>
 </context>
 <context>
@@ -2419,12 +2429,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Erreur de connexion</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Vous devez vous connecter en tant qu&apos;utilisateur %1</translation>
    </message>
@@ -2747,7 +2757,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <location filename="../src/libsync/syncengine.cpp" line="656"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
-        <translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
+        <translation>Seulement %1 disponibles, nécessite au moins %2 pour commencer</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1047"/>
@@ -2867,7 +2877,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="826"/>
        <source>File name contains at least one invalid character</source>
-        <translation>Le nom de fichier contient au moins un caractère non valable</translation>
+        <translation>Le nom de fichier contient au moins un caractère non valide</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1015"/>
@@ -3363,7 +3373,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/libsync/utility.cpp" line="460"/>
        <source>Some time ago</source>
-        <translation>Il y a quelque temps</translation>
+        <translation>Il y a quelques temps</translation>
    </message>
 </context>
 <context>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servizo non dispoñíbel</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Produciuse un erro de rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Produciuse un erro de configuración</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estado da conta descoñecido</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>É necesario volver autenticarse</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Interrompido polo usuario</translation>
    </message>
@@ -2321,29 +2331,29 @@ Recomendámoslle que non o use.</translation>
        <translation>Contr&amp;asinal de protección</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protexido con contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Estabeleza o contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Ligazón para compartir</translation>
    </message>
@@ -2412,12 +2422,12 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Erro de acceso</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Ten que rexistrarse como usuario %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Kijelentkezve</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Szétcsatlakozva</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Csatlakozva</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Szolgáltatás nem érhető el</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Hálózati hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Beállítási hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Ismeretlen fiók állapot</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Felhasználóazonosítás szükséges</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Felhasználó megszakította</translation>
    </message>
@@ -2315,29 +2325,29 @@ It is not advisable to use it.</source>
        <translation>J&amp;elszóval védve</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Jelszóval védett</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>A fájlt nem lehetett megosztani, mert megosztási jogosultság nélkül lett megosztva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <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="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Hivatkozás &amp;megosztása</translation>
    </message>
@@ -2406,12 +2416,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Bejelentkezési hiba</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>%1 felhasználóként kell belépned</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Disconnesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Disconnesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Connesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servizio non disponibile</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Errore di rete</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Errore di configurazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Stato dell&apos;account sconosciuto</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Nuova autenticazione richiesta</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Devi effettuare nuovamente l&apos;accesso per continuare a utilizzare l&apos;account %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Interrotto dall&apos;utente</translation>
    </message>
@@ -2325,29 +2335,29 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Proteggi con p&amp;assword</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protetta da password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>imposta la password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Condividi colle&amp;gamento</translation>
    </message>
@@ -2416,12 +2426,12 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Errore di accesso</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Devi accedere con l&apos;utente %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>サインアウト</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>切断しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>接続しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>サービスが利用できません</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>ネットワークエラー</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>設定エラー</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>不明なアカウント状態</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>再認証が必要</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>アカウント%1を使用し続けるには再ログインが必要です。</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -322,7 +332,7 @@
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
        <source>%1 on %2 (disconnected)</source>
-        <translation>%2 中 %1 (切断しました)</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>ユーザーによって中止されました</translation>
    </message>
@@ -2322,29 +2332,29 @@ It is not advisable to use it.</source>
        <translation>パスワード保護(&amp;A)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>パスワード保護</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>共有するにはパスワードが必要(&amp;A)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>パスワードを入力してください</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>リンク共有(&amp;S)</translation>
    </message>
@@ -2413,12 +2423,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>ログインエラー</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>ユーザー %1 としてログインする必要があります</translation>
    </message>
@@ -3329,7 +3339,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/application.cpp" line="571"/>
        <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Logget ut</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Frakoblet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Tilkoblet</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Tjeneste utilgjengelig</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Nettverksfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Konfigurasjonsfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Ukjent kontotilstand</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Ny autentisering kreves</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Du må logge inn på nytt for å fortsette å bruke konto %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Avbrutt av brukeren</translation>
    </message>
@@ -2326,29 +2336,29 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>P&amp;assordbeskyttelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Passordbeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Sett passord</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Del lenke</translation>
    </message>
@@ -2417,12 +2427,12 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Innloggingsfeil</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Du må logge inn som bruker %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Afgemeld</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Niet verbonden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Verbonden</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Dienst niet beschikbaar</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Netwerkfout</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Configuratiefout</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Onbekende account-status</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Hernieuwde authenticatie nodig</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>U moet opnieuw inloggen om verder te gaan met account %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Afgebroken door de gebruiker</translation>
    </message>
@@ -2327,29 +2337,29 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>&amp;Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Stel uw wachtwoord in</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Deel link</translation>
    </message>
@@ -2418,12 +2428,12 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Inlogfout</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>U moet inloggen als gebruiker %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Odłączony</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Rozłączony</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Połączony</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Usługa niedostępna</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Błąd sieci</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Błąd konfiguracji</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Status konta nieznany</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Wymagana powtórna autoryzacja</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Anulowane przez użytkownika</translation>
    </message>
@@ -2313,29 +2323,29 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Zabezpieczone hasłem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Proszę podać hasło</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2404,12 +2414,12 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Błąd logowania</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Musisz zalogować się jako użytkownik %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Sessão terminada</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Servidor indisponível</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Erro de rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Erro de configuração</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estado de conta desconhecido</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>É necessario autenticar novamente</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Volte a iniciar a sessão para poder continuar a utilizar a conta %1</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -360,17 +370,17 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="450"/>
        <source>The server activity list has been copied to the clipboard.</source>
-        <translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="454"/>
        <source>The sync activity list has been copied to the clipboard.</source>
-        <translation>A lista de atividades de sincronização foi copiada para a área de transferência.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="457"/>
        <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="462"/>
@@ -409,7 +419,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="320"/>
        <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
-        <translation>&lt;br/&gt;Conta %1 não tem atividades ativada.</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Cancelado pelo utilizador</translation>
    </message>
@@ -688,7 +698,7 @@ Tem a certeza que deseja realizar esta operação?</translation>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1102"/>
        <source>Waiting to start syncing.</source>
-        <translation>À espera de começar a sincronização.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1105"/>
@@ -825,29 +835,29 @@ Tem a certeza que deseja realizar esta operação?</translation>
    <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>Adicionar pasta está desativado porque você já está a sincronizar todos os seus ficheiros. Se deseja sincronizar várias pastas, por favor remova a atualmente configurada pasta de raiz.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
        <source>Fetching folder list from server...</source>
-        <translation>Obtendo lista de pastas do servidor...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="809"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>Procurando por alterações em &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="844"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
-        <translation>, &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="847"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
-        <translation>&apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
@@ -935,7 +945,7 @@ Tempo total restante %5</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="564"/>
        <source>Add Sync Connection</source>
-        <translation>Adicionar Ligação de Sincronização</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1098,7 +1108,7 @@ Tempo total restante %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="26"/>
        <source>&amp;Launch on System Startup</source>
-        <translation>&amp;Iniciar com o Arranque do Sistema</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="33"/>
@@ -1108,22 +1118,22 @@ Tempo total restante %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="43"/>
        <source>Use &amp;Monochrome Icons</source>
-        <translation>Usar Ícones &amp;Monocromáticos</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="59"/>
        <source>Edit &amp;Ignored Files</source>
-        <translation>Editar Ficheiros &amp;Ignorados</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="81"/>
        <source>Ask &amp;confirmation before downloading folders larger than</source>
-        <translation>Pedir &amp;confirmação antes de descarregar pastas maiores que</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="129"/>
        <source>S&amp;how crash reporter</source>
-        <translation>M&amp;ostrar relatório de erros</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="156"/>
@@ -1457,7 +1467,7 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a
    <message>
        <location filename="../src/gui/networksettings.cpp" line="128"/>
        <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation>Qt &gt;= 5.4 é necessário a fim de utilizar o limite tráfego</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1492,12 +1502,12 @@ privilégios adicionais durante o processo.</translation>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
        <source>%1 version %2 available. Restart application to start the update.</source>
-        <translation>%1 versão %2 disponível. Reinicie a aplicação para iniciar a atualização.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
        <source>New %1 version %2 available. Please use the system&apos;s update tool to install it.</source>
-        <translation>Nova %1 versão %2 disponível. Por favor utilize a ferramenta de atualização d sistema para a instalar.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
@@ -1836,7 +1846,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
        <source>The download would reduce free disk space below %1</source>
-        <translation>O download pode reduzir o espaço livre em disco para abaixo de %1</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
@@ -1887,7 +1897,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>Não foi possivel eliminar o ficheiro %1, erro: %2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -1910,7 +1920,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>Não foi possível remover a pasta &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -2011,7 +2021,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="708"/>
        <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
-        <translation>O servidor não reconheceu a última parte. (Nenhuma e-tag estava presente)</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2054,7 +2064,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="69"/>
        <source>Local sync protocol</source>
-        <translation>Protocolo de sincronização local</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="71"/>
@@ -2249,7 +2259,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="14"/>
        <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="47"/>
@@ -2274,7 +2284,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="91"/>
        <source>The server does not allow sharing</source>
-        <translation>O servidor não permite partilhas</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2325,29 +2335,29 @@ It is not advisable to use it.</source>
        <translation>Protegida por senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protegido com Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Compartilhe a hiperligação </translation>
    </message>
@@ -2367,7 +2377,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
        <source>No results for &apos;%1&apos;</source>
-        <translation>Sem resultados para &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2416,12 +2426,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Erro de login</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Deve fazer o login como utilizador %1.</translation>
    </message>
@@ -2744,7 +2754,7 @@ It is not advisable to use it.</source>
        <location filename="../src/libsync/syncengine.cpp" line="656"/>
        <source>Only %1 are available, need at least %2 to start</source>
        <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
-        <translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1047"/>
@@ -2789,7 +2799,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="144"/>
        <source>CSync failed due to unhandled permission denied.</source>
-        <translation>CSync falhou devido a permissão não tratada negada.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="150"/>
@@ -2804,7 +2814,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>Access is forbidden</source>
-        <translation>O acesso é proibido</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="179"/>
@@ -2919,7 +2929,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/synclogdialog.ui" line="14"/>
        <source>Synchronisation Log</source>
-        <translation>Log de Sincronização</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2958,7 +2968,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/checksums.cpp" line="201"/>
        <source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
-        <translation>O header checksum continha um tipo de checksum desconhecido &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/checksums.cpp" line="206"/>
@@ -3015,7 +3025,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="566"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>Procurando por alterações em &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="335"/>
@@ -3075,12 +3085,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="444"/>
        <source>Log out of all accounts</source>
-        <translation>Sair de todas as contas</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="452"/>
        <source>Log in to all accounts...</source>
-        <translation>Entrar em todas as contas...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="527"/>
@@ -3332,7 +3342,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/application.cpp" line="571"/>
        <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3340,17 +3350,17 @@ It is not advisable to use it.</source>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="445"/>
        <source>%1 day(s) ago</source>
-        <translation><numerusform>%1 dia atrás</numerusform><numerusform>%1 dias atrás</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="451"/>
        <source>%1 hour(s) ago</source>
-        <translation><numerusform>%1 hora(s) atrás</numerusform><numerusform>%1 hora(s) atrás</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="455"/>
        <source>Less than a minute ago</source>
-        <translation>Menos de um minuto atrás</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="457"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Assinado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Desconectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Conectado</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Serviço indisponível</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Erro de rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Erro de configuração</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Estado da conta desconhecido</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Reautenticação necessária</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Você precisa reconectar para continuar usando a conta %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Abortado pelo usuário</translation>
    </message>
@@ -2325,29 +2335,29 @@ It is not advisable to use it.</source>
        <translation>S&amp;enha de proteção</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Protegido por Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Link de &amp;Compartilhamento</translation>
    </message>
@@ -2416,12 +2426,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Erro de Login</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Você deve entrar como usuário %1</translation>
    </message>
@@ -3340,22 +3350,22 @@ It is not advisable to use it.</source>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="445"/>
        <source>%1 day(s) ago</source>
-        <translation><numerusform>%1 dia atrás</numerusform><numerusform>%1 dias atrás</numerusform></translation>
+        <translation><numerusform>%1 dia(s) atráz</numerusform><numerusform>%1 dia(s) atráz</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="451"/>
        <source>%1 hour(s) ago</source>
-        <translation><numerusform>%1 hora atrás</numerusform><numerusform>%1 horas atrás</numerusform></translation>
+        <translation type="unfinished"><numerusform>%1 hora(s) atráz</numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="455"/>
        <source>Less than a minute ago</source>
-        <translation>A menos de um minuto atrás</translation>
+        <translation>A menos de um minuto atras</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="457"/>
        <source>%1 minute(s) ago</source>
-        <translation><numerusform>%1 minuto atrás</numerusform><numerusform>%1 minutos atrás</numerusform></translation>
+        <translation><numerusform>%1 minuto(s) atrás</numerusform><numerusform>%1 minuto(s) atrás</numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="460"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Вышли из аккаунта</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Отсоединен</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Соединен</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Сервис недоступен</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Ошибка сети</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Ошибка конфигурации</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Неизвестное состояние учетной записи</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Требуется повторная аутентификация</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Необходимо перезайти, чтобы продолжить пользоваться аккаунтом %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Прервано пользов</translation>
    </message>
@@ -2329,29 +2339,29 @@ It is not advisable to use it.</source>
        <translation>Защитить паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Защищено Паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Публичные ссылки требуют пароля</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Пожалуйста, установите пароль</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Поделиться ссылкой</translation>
    </message>
@@ -2420,12 +2430,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Ошибка входа</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Вы должны войти как пользователь %1</translation>
    </message>
@@ -3336,7 +3346,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/application.cpp" line="571"/>
        <source>QT_LAYOUT_DIRECTION</source>
-        <translation>QT_LAYOUT_DIRECTION</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Odhlásený</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Odpojený</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Pripojené</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Služba nedostupná</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Chyba siete</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Chyba nastavenia</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Neznámy stav účtu</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Vyžaduje sa opätovné overenie</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Zrušené používateľom</translation>
    </message>
@@ -2322,29 +2332,29 @@ Nie je vhodné ju používať.</translation>
        <translation>Ch&amp;rániť heslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Chránené heslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Tento súbor nemožno zdieľať, lebo bol vyzdieľaný bez možnosti ďalšieho zdieľania.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <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="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Prosím nastavte si heslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Zdieľať odkaz</translation>
    </message>
@@ -2413,12 +2423,12 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Chybné prihlásenie</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Musíte sa prihlásiť ako používateľ %1</translation>
    </message>
@@ -78,7 +78,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="76"/>
        <source>Storage space: ...</source>
-        <translation>Prostor: ...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="146"/>
@@ -110,7 +110,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="142"/>
        <source>Add new</source>
-        <translation>Dodaj novo</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="150"/>
@@ -125,12 +125,12 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="216"/>
        <source>Choose what to sync</source>
-        <translation>Izbor predmetov za usklajevanje</translation>
+        <translation>Izbor datotek za usklajevanje</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="223"/>
        <source>Remove folder sync connection</source>
-        <translation>Odstrani povezavo mape usklajevanja</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="289"/>
@@ -140,17 +140,17 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="290"/>
        <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
-        <translation>&lt;p&gt;Ni mogoče ustvariti krajevne mape &lt;i&gt;%1&lt;/i&gt;.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="337"/>
        <source>Confirm Folder Sync Connection Removal</source>
-        <translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="343"/>
        <source>Remove Folder Sync Connection</source>
-        <translation>Odstrani povezavo usklajevanja mape</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="369"/>
@@ -175,32 +175,32 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="520"/>
        <source>%1 in use</source>
-        <translation>%1 v uporabi</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="540"/>
        <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
-        <translation>%1 kot &lt;i&gt;%2&lt;/i&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="544"/>
        <source>Connected to %1.</source>
-        <translation>Povezano z %1.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="546"/>
        <source>Server %1 is temporarily unavailable.</source>
-        <translation>Strežnik %1 trenutno ni dosegljiv.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="548"/>
        <source>Signed out from %1.</source>
-        <translation>Uspešno odjavljeno iz %1.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="550"/>
        <source>No connection to %1 at %2.</source>
-        <translation>Ni povezave z %1 pri %2.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="576"/>
@@ -210,12 +210,12 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="657"/>
        <source>There are new folders that were not synchronized because they are too big: </source>
-        <translation>Zaznane so mape, ki zaradi prevelike velikosti niso bile usklajene:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="697"/>
        <source>Confirm Account Removal</source>
-        <translation>Potrdi odstranitev računa</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="698"/>
@@ -225,7 +225,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="704"/>
        <source>Remove connection</source>
-        <translation>Odstrani povezavo</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="213"/>
@@ -261,7 +261,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="508"/>
        <source>%1 of %2 in use</source>
-        <translation>%1 od %2 v uporabi</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="517"/>
@@ -277,39 +277,49 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
-        <translation>Odjavljeno</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Brez povezave</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Povezano</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Storitev ni na voljo</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Omrežna napaka</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
-        <translation>Napaka nastavitve</translation>
+        <translation>Napaka v nastavitvah</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
-        <translation>Neznano stanje računa</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Zahtevano je vnovično overjanje istovetnosti</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -317,12 +327,12 @@
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="145"/>
        <source>%1 on %2</source>
-        <translation>%1 na %2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
        <source>%1 on %2 (disconnected)</source>
-        <translation>%1 na %2 (brez povezave)</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -330,7 +340,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="408"/>
        <source>Server Activity</source>
-        <translation>Dejavnost strežnika</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="413"/>
@@ -340,7 +350,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="419"/>
        <source>List of ignored or erroneous files</source>
-        <translation>Seznam prezrtih datotek ali datotek z napako</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="423"/>
@@ -355,22 +365,22 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="429"/>
        <source>Not Synced</source>
-        <translation>Ni usklajeno</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="450"/>
        <source>The server activity list has been copied to the clipboard.</source>
-        <translation>Seznam opravil strežnika je kopiran v odložišče.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="454"/>
        <source>The sync activity list has been copied to the clipboard.</source>
-        <translation>Seznam opravil usklajevanja je kopiran v odložišče.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="457"/>
        <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation>Seznam neusklajenih predmetov je kopiran v odložišče.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="462"/>
@@ -394,7 +404,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="313"/>
        <source>Server Activities</source>
-        <translation>Dejavnosti strežnika</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="286"/>
@@ -409,7 +419,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="320"/>
        <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
-        <translation>&lt;br/&gt;Za račun %1 možnosti opravil niso omogočene.</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
    </message>
@@ -537,7 +547,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="164"/>
        <source>%1 should be a folder but is not.</source>
-        <translation>%1 bi morala biti mapa, pa ni.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="167"/>
@@ -670,12 +680,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="885"/>
        <source> (backup)</source>
-        <translation>(varnostna kopija)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="890"/>
        <source> (backup %1)</source>
-        <translation>(varnostna kopija %1)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1099"/>
@@ -685,7 +695,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1102"/>
        <source>Waiting to start syncing.</source>
-        <translation>Čakanje začetek usklajevanja</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1105"/>
@@ -730,12 +740,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1139"/>
        <source>No valid folder selected!</source>
-        <translation>Ni izbrane veljavne mape!</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1150"/>
        <source>The selected path is not a folder!</source>
-        <translation>Izbrana pot ni mapa!</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1154"/>
@@ -745,12 +755,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1169"/>
        <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
-        <translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1174"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Krajevna mapa %1 že vključuje mapo, ki je določena za usklajevanje. Izbrati je treba drugo.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1181"/>
@@ -773,7 +783,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="45"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Dodaj povezavo za usklajevanje mape</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="290"/>
@@ -796,7 +806,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
        <source>You need to be connected to add a folder</source>
-        <translation>Za dodajanje mape mora biti vzpostavljea povezava</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="137"/>
@@ -807,7 +817,7 @@ Are you sure you want to perform this operation?</source>
        <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
        <source>%1 (%2)</source>
        <extracomment>Example text: &quot;File.txt (23KB)&quot;</extracomment>
-        <translation>%1 (%2)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="167"/>
@@ -817,7 +827,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="201"/>
        <source>Signed out</source>
-        <translation>Odjavljeno</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
@@ -827,30 +837,30 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
        <source>Fetching folder list from server...</source>
-        <translation>Poteka pridobivanje seznama map s strežnika ...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="809"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>Preverjanje za spremembe v &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="844"/>
        <source>, &apos;%1&apos;</source>
        <extracomment>Build a list of file names</extracomment>
-        <translation>, &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="847"/>
        <source>&apos;%1&apos;</source>
        <extracomment>Argument is a file name</extracomment>
-        <translation>&apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
        <source>Syncing %1</source>
        <extracomment>Example text: &quot;Syncing 'foo.txt', 'bar.txt'&quot;</extracomment>
-        <translation>Usklajevanje %1</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="874"/>
@@ -862,23 +872,23 @@ Are you sure you want to perform this operation?</source>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
        <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>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="880"/>
        <source>u2193 %1/s</source>
-        <translation>u2193 %1/s</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="887"/>
        <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>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
        <source>u2191 %1/s</source>
-        <translation>u2191 %1/s</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="894"/>
@@ -909,7 +919,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="961"/>
        <source>Waiting...</source>
-        <translation>Čakanje na povezavo ...</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folderstatusmodel.cpp" line="963"/>
@@ -919,7 +929,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="969"/>
        <source>Preparing to sync...</source>
-        <translation>Priprava na usklajevanje ...</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -927,12 +937,12 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="562"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Dodaj povezavo za usklajevanje mape</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="564"/>
        <source>Add Sync Connection</source>
-        <translation>Dodaj povezavo za usklajevanje</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -998,7 +1008,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="271"/>
        <source>Failed to list a folder. Error: %1</source>
-        <translation>Napaka izpisovanja datotek mape.  Napaka: %1</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="351"/>
@@ -1080,7 +1090,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="40"/>
        <source>For System Tray</source>
-        <translation>V sistemsko vrstico</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="53"/>
@@ -1100,7 +1110,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="33"/>
        <source>Show &amp;Desktop Notifications</source>
-        <translation>Pokaži opozorila na namizju</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="43"/>
@@ -1110,7 +1120,7 @@ Skupaj še %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="59"/>
        <source>Edit &amp;Ignored Files</source>
-        <translation>Uredi &amp;prezrte datoteke</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="81"/>
@@ -1196,7 +1206,7 @@ Account: %3
    <message>
        <location filename="../src/gui/ignorelisteditor.ui" line="80"/>
        <source>Allow Deletion</source>
-        <translation>Dovoli brisanje</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/ignorelisteditor.ui" line="45"/>
@@ -1271,7 +1281,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="105"/>
        <source>Save the log file to a file on disk for debugging.</source>
-        <translation>Shrani dnevniško datoteko na disk za nadaljnje razhroščevanje.</translation>
+        <translation>Shrani beleženje v dnevniško datoteko na disk za nadaljnje razhroščevanje.</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="184"/>
@@ -1508,7 +1518,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
        <source>Update Check</source>
-        <translation>Preverjanje za posodobitve</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1536,7 +1546,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
        <source>Sync the folder &apos;%1&apos;</source>
-        <translation>Uskladi mapo &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
@@ -1666,7 +1676,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
-        <translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop,  &lt;a href=&quot;%1&quot;&gt;kliknite tu&lt;/a&gt; za dostop do te storitve z brskalnikom.</translation>
+        <translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop,  &lt;a href=&quot;%1&quot;&gt;kliknite tu&lt;/a&gt; za dostop do te storitve z vašim brskalnikom.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
@@ -1763,7 +1773,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
-        <translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
+        <translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
@@ -1833,12 +1843,12 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
        <source>Free space on disk is less than %1</source>
-        <translation>Prostor na disku je manjši od %1</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
        <source>File was deleted from server</source>
-        <translation>Datoteka je izbrisana s strežnika</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
@@ -1879,7 +1889,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
        <source>could not delete file %1, error: %2</source>
-        <translation>ni mogoče izbrisati datoteke %1, napaka: %2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -1889,7 +1899,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
        <source>could not create folder %1</source>
-        <translation>ni mogoče ustvariti mape %1</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1902,7 +1912,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
        <source>Could not remove folder &apos;%1&apos;</source>
-        <translation>Ni mogoče odstraniti mape &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -2237,7 +2247,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="14"/>
        <source>Dialog</source>
-        <translation>Pogovorno okno</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="47"/>
@@ -2313,29 +2323,29 @@ Uporaba ni priporočljiva.</translation>
        <translation>&amp;Zaščiti z geslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Zaščiteno z geslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>Povezava za &amp;souporabo</translation>
    </message>
@@ -2393,7 +2403,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/>
        <source>change</source>
-        <translation>spremeni</translation>
+        <translation>sprememba</translation>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="272"/>
@@ -2404,12 +2414,12 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Napaka prijave</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Prijaviti se je treba kot uporabnik %1</translation>
    </message>
@@ -2721,12 +2731,12 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="171"/>
        <source>An error occurred while opening a folder</source>
-        <translation>Med odpiranjem mape je prišlo do napake.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="174"/>
        <source>Error while reading folder.</source>
-        <translation>Napaka med branjem mape</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="656"/>
@@ -2792,7 +2802,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="168"/>
        <source>Access is forbidden</source>
-        <translation>Dostop je prepovedan.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="179"/>
@@ -2986,7 +2996,7 @@ Uporaba ni priporočljiva.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="454"/>
        <location filename="../src/gui/owncloudgui.cpp" line="521"/>
        <source>Log in...</source>
-        <translation>Prijava ...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="351"/>
@@ -3003,7 +3013,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="566"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>Preverjanje za spremembe v &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="335"/>
@@ -3058,17 +3068,17 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="257"/>
        <source>Account %1: %2</source>
-        <translation>Račun %1: %2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="444"/>
        <source>Log out of all accounts</source>
-        <translation>Odjavi vse račune</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="452"/>
        <source>Log in to all accounts...</source>
-        <translation>Prijavi z vsemi računi ...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="527"/>
@@ -3328,27 +3338,27 @@ Uporaba ni priporočljiva.</translation>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="445"/>
        <source>%1 day(s) ago</source>
-        <translation><numerusform>pred %1 dnevom</numerusform><numerusform>pred %1 dnevoma</numerusform><numerusform>pred %1 dnevi</numerusform><numerusform>pred %1 dnevi</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="451"/>
        <source>%1 hour(s) ago</source>
-        <translation><numerusform>pred %1 uro</numerusform><numerusform>pred %1 urama</numerusform><numerusform>pred %1 urami</numerusform><numerusform>pred %1 urami</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="455"/>
        <source>Less than a minute ago</source>
-        <translation>Pred manj kot minuto</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/libsync/utility.cpp" line="457"/>
        <source>%1 minute(s) ago</source>
-        <translation><numerusform>pred %1 minuto</numerusform><numerusform>pred %1 minutama</numerusform><numerusform>pred %1 minutami</numerusform><numerusform>pred %1 minutami</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="460"/>
        <source>Some time ago</source>
-        <translation>Pred nekaj časa</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3366,7 +3376,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/utility.cpp" line="127"/>
        <source>%L1 KB</source>
-        <translation>%L1 KB</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="130"/>
@@ -3406,7 +3416,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/libsync/utility.cpp" line="320"/>
        <source>0 seconds</source>
-        <translation>0 sekund</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/utility.cpp" line="335"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Одјављен</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Неповезан</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Повезан</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Услуга није доступна</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Грешка мреже</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Грешка подешавања</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Непознато стање налога</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Неопходна поновна аутентификација</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Прекинуо корисник</translation>
    </message>
@@ -2323,29 +2333,29 @@ It is not advisable to use it.</source>
        <translation>&amp;Заштићено лозинком</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Заштићено лозинком</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Јавно дељење з&amp;хтева лозинку</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Поставите лозинку</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Веза дељења</translation>
    </message>
@@ -2414,12 +2424,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Грешка пријављивања</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Морате се пријавити као %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Utloggad</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Bortkopplad</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Ansluten</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Tjänsten är inte tillgänglig</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Nätverksfel</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Konfigurationsfel</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Okänd kontostatus</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Autentisering krävs</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>Du behöver logga in på nytt för att fortsätta använda kontot %1.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Avbruten av användare</translation>
    </message>
@@ -2319,29 +2329,29 @@ Det är inte lämpligt använda den.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Lösenordsskyddad</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation type="unfinished"/>
    </message>
@@ -2410,12 +2420,12 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Login fel</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Du måste logga in som en användare %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>ออกจากระบบ</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>ยกเลิกการเชื่อมต่อ</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>เชื่อมต่อ</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>ไม่สามารถให้บริการได้</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>ข้อผิดพลาดของเครือข่าย</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>กำหนดค่าผิดพลาด</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>ไม่ระบุสถานะบัญชี</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>จำเป้นต้องรับรองความถูกต้องอีกครั้ง</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>คุณจำเป็นต้องเข้าสู่ระบบใหม่ เพื่อดำเนินการใช้บัญชี %1 ต่อ</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>ยกเลิกโดยผู้ใช้</translation>
    </message>
@@ -2321,29 +2331,29 @@ It is not advisable to use it.</source>
        <translation>รหัสผ่านป้องกัน</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>รหัสผ่านถูกป้องกันแล้ว</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>การแชร์สาธารณะจำเป็นต้องมีรหัสผ่าน</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>กรุณาตั้งรหัสผ่าน</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;แชร์ลิงค์</translation>
    </message>
@@ -2412,12 +2422,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>เข้าสู่ระบบผิดพลาด</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>คุณต้องเข้าสู่ระบบเป็นผู้ใช้ %1</translation>
    </message>
@@ -83,7 +83,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="146"/>
        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
-        <translation>Seçilmemiş klasörler yerel dosya sisteminizden &lt;b&gt;kaldırılacak&lt;/b&gt; ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
+        <translation>Seçilmemiş klasörler yerel dosya sisteminizden &lt;b&gt;silinecek&lt;/b&gt; ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="193"/>
@@ -145,12 +145,12 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="337"/>
        <source>Confirm Folder Sync Connection Removal</source>
-        <translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation>
+        <translation>Klasör eşitleme bağlantısını silinmesini onaylayın</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="343"/>
        <source>Remove Folder Sync Connection</source>
-        <translation>Klasör Eşitleme Bağlantısını Sil</translation>
+        <translation>Klasör eşitleme bağlantısını sil</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="369"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Oturum sonlandırıldı</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Bağlantı kesildi</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>Bağlandı</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Hizmet kullanılamıyor</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Ağ hatası</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Yapılandırma hatası</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Bilinmeyen hesap durumu</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Yeniden kimlik doğrulama gerekli</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>%1 hesabını kullanmaya devam etmek için yeniden oturum açmanız gerekiyor.</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Kullanıcı tarafından iptal edildi</translation>
    </message>
@@ -776,7 +786,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="45"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Klasör Eşitleme Bağlantısı Ekle</translation>
+        <translation>Klasör eşitleme bağlantısını ekle</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="290"/>
@@ -825,7 +835,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <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>Klasör ekleme devre dışı, çünkü şu anda bütün dosyalarınızı eşitliyorsunuz. Çoklu klasör eşitlemesi yapmak istiyorsanız, lütfen geçerli yapılandırılmış kök klasörünü silin.</translation>
+        <translation>Klasör ekleme devre dışıdır, çünkü şu anda bütün dosyalarınızı eşitliyorsunuz. Eğer çoklu klasör eşitlemesi yapmak istiyorsanız, lütfen geçerli yapılandırılmış kök klasörünü silin.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
@@ -835,7 +845,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="809"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>%1 üzerindeki değişiklikler denetleniyor</translation>
+        <translation>%1 deki değişiklikler denetleniyor</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="844"/>
@@ -865,7 +875,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
        <source>download %1/s</source>
        <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
-        <translation>indirme %1/s</translation>
+        <translation>indir %1/s</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="880"/>
@@ -876,7 +886,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
        <location filename="../src/gui/folderstatusmodel.cpp" line="887"/>
        <source>upload %1/s</source>
        <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
-        <translation>gönderme %1/s</translation>
+        <translation>yükle %1/s</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
@@ -930,12 +940,12 @@ Toplam kalan süre: %5</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="562"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Klasör Eşitleme Bağlantısı Ekle</translation>
+        <translation>Klasör eşitleme bağlantısını ekle</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="564"/>
        <source>Add Sync Connection</source>
-        <translation>Eşitleme Bağlantısı Ekle</translation>
+        <translation>Eşitleme bağlantısını ekle</translation>
    </message>
 </context>
 <context>
@@ -1098,32 +1108,32 @@ Toplam kalan süre: %5</translation>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="26"/>
        <source>&amp;Launch on System Startup</source>
-        <translation>&amp;Sistem Başlangıcında Çalıştır</translation>
+        <translation>Sistem Başlangıcında Çalıştır</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="33"/>
        <source>Show &amp;Desktop Notifications</source>
-        <translation>Masaüstü &amp;Bildirimlerini Göster</translation>
+        <translation>Masaüstü Bildirimlerini Göster</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="43"/>
        <source>Use &amp;Monochrome Icons</source>
-        <translation>İki &amp;Renkli Simgeler Kullan</translation>
+        <translation>İki Renkli Simgeler Kullan</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="59"/>
        <source>Edit &amp;Ignored Files</source>
-        <translation>Yoksayılan &amp;Dosyaları Düzenle</translation>
+        <translation>Yoksayılan Dosyaları Düzenle</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="81"/>
        <source>Ask &amp;confirmation before downloading folders larger than</source>
-        <translation>Bundan &amp;daha büyük klasörlerin eşitlenmesi için onay iste:</translation>
+        <translation>Bundan daha büyük klasörlerin eşitlenmesi için onay iste:</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="129"/>
        <source>S&amp;how crash reporter</source>
-        <translation>Ç&amp;ökme bildiricisini göster</translation>
+        <translation>Çökme bildiricisini göster</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="156"/>
@@ -1457,7 +1467,7 @@ Bir dizinin silinmesine engel oluyorsa silmeye izin verilen yerlerdeki ögeler s
    <message>
        <location filename="../src/gui/networksettings.cpp" line="128"/>
        <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation>Bant genişliği sınırlaması için Qt &gt;= 5.4 gerekmektedir</translation>
+        <translation>Band genişliği sınırlaması için Qt &gt;= 5.4 gerekmektedir</translation>
    </message>
 </context>
 <context>
@@ -1516,7 +1526,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
        <source>Update Check</source>
-        <translation>Güncelleme Denetimi</translation>
+        <translation>Kontrolü Güncelle</translation>
    </message>
 </context>
 <context>
@@ -1544,7 +1554,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
        <source>Sync the folder &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; klasörünü eşitle</translation>
+        <translation>&apos;%1&apos; dizinini eşitle</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
@@ -1910,7 +1920,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
        <source>Could not remove folder &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; klasörü silinemiyor</translation>
+        <translation>&apos;%1&apos; dizini silinemiyor;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -2274,7 +2284,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="91"/>
        <source>The server does not allow sharing</source>
-        <translation>Sunucu, paylaşımı desteklemiyor</translation>
+        <translation>Sunucu paylaşımı desteklemiyor.</translation>
    </message>
 </context>
 <context>
@@ -2325,29 +2335,29 @@ Kullanmanız önerilmez.</translation>
        <translation>&amp;Parola koruması</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Parola Korumalı</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Herkese &amp;açık paylaşım için parola gerekir</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>Lütfen Parola Atayın</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;Paylaşma bağlantısı</translation>
    </message>
@@ -2416,12 +2426,12 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Oturum Açma Hatası</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>%1 kullanıcısı olarak oturum açmalısınız</translation>
    </message>
@@ -2590,12 +2600,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sslerrordialog.cpp" line="66"/>
        <source>Untrusted Certificate</source>
-        <translation>Güvensiz Sertifika</translation>
+        <translation>Geçersiz veya Güvensiz Sertifika</translation>
    </message>
    <message>
        <location filename="../src/gui/sslerrordialog.cpp" line="135"/>
        <source>Cannot connect securely to &lt;i&gt;%1&lt;/i&gt;:</source>
-        <translation>&lt;i&gt;%1&lt;/i&gt; sunucusuna güvenli şekilde bağlanılamıyor:</translation>
+        <translation>&lt;i&gt;%1&lt;/i&gt; güvenli şekilde bağlanılamıyor:</translation>
    </message>
    <message>
        <location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2839,7 +2849,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="417"/>
        <source>Stat failed.</source>
-        <translation>Durum alma başarısız.</translation>
+        <translation>Durum hatalı.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="444"/>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>Вимкнутий</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>Від&apos;єднаний</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>З&apos;єднаний</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>Сервіс недоступний</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>Помилка мережі</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>Помилка конфігурації</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>Невідомий стан облікового запису</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>Потрібна повторна аутентифікація</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>Перервано користувачем</translation>
    </message>
@@ -2318,29 +2328,29 @@ It is not advisable to use it.</source>
        <translation>&amp;Захистити паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>Захищено паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Публічне по&amp;ширення вимагає пароль</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>По&amp;ділитись посиланням</translation>
    </message>
@@ -2409,12 +2419,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>Помилка входу</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>Ви маєте увійти як %1</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>已登出</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>连接已断开</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>已连接</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>服务不可用</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>网络错误</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>配置错误</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>未知的账户状态</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>需要重新认证</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>用户撤销</translation>
    </message>
@@ -2313,29 +2323,29 @@ It is not advisable to use it.</source>
        <translation>密码保护(&amp;a)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>密码保护</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>未分配共享权限，无法共享文件。</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>请设置密码</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>分享链接(&amp;s)</translation>
    </message>
@@ -2404,12 +2414,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>登录错误</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>你必须以用户&apos;%1&apos;身份登录</translation>
    </message>
@@ -277,40 +277,50 @@
 <context>
    <name>OCC::AccountState</name>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="99"/>
+        <location filename="../src/gui/accountstate.cpp" line="100"/>
        <source>Signed out</source>
        <translation>已登出</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="101"/>
+        <location filename="../src/gui/accountstate.cpp" line="102"/>
        <source>Disconnected</source>
        <translation>已經離線</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="103"/>
+        <location filename="../src/gui/accountstate.cpp" line="104"/>
        <source>Connected</source>
        <translation>已連線</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="105"/>
+        <location filename="../src/gui/accountstate.cpp" line="106"/>
        <source>Service unavailable</source>
        <translation>服務無法使用</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="107"/>
+        <location filename="../src/gui/accountstate.cpp" line="108"/>
        <source>Network error</source>
        <translation>網路異常</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="109"/>
+        <location filename="../src/gui/accountstate.cpp" line="110"/>
        <source>Configuration error</source>
        <translation>設定錯誤</translation>
    </message>
    <message>
-        <location filename="../src/gui/accountstate.cpp" line="111"/>
+        <location filename="../src/gui/accountstate.cpp" line="112"/>
        <source>Unknown account state</source>
        <translation>未知的帳號狀態</translation>
    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>Reauthentication required</source>
+        <translation>要求重新驗證</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/accountstate.cpp" line="267"/>
+        <source>You need to re-login to continue using the account %1.</source>
+        <translation>您需要重新登入才能繼續使用帳號 %1</translation>
+    </message>
 </context>
 <context>
    <name>OCC::ActivityItemDelegate</name>
@@ -517,7 +527,7 @@
 <context>
    <name>OCC::DiscoveryMainThread</name>
    <message>
-        <location filename="../src/libsync/discoveryphase.cpp" line="536"/>
+        <location filename="../src/libsync/discoveryphase.cpp" line="539"/>
        <source>Aborted by the user</source>
        <translation>使用者中斷</translation>
    </message>
@@ -2324,29 +2334,29 @@ It is not advisable to use it.</source>
        <translation>&amp;密碼保護</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
        <source>Password Protected</source>
        <translation>密碼保護</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="291"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="371"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>公開&amp;共享需要密碼</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="431"/>
        <source>Please Set Password</source>
        <translation>請設定密碼</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
        <source>&amp;Share link</source>
        <translation>&amp;分享連結</translation>
    </message>
@@ -2415,12 +2425,12 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::ShibbolethCredentials</name>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>Login Error</source>
        <translation>登入錯誤</translation>
    </message>
    <message>
-        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="230"/>
+        <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="229"/>
        <source>You must sign in as user %1</source>
        <translation>您必須以 %1 使用者登入</translation>
    </message>