VERSION.cmake: 2.4.0 final

2026-04-05 05:34:18 +02:00 · 2017-12-20 16:03:02 +01:00
106 changed files with 2464 additions and 3604 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,91 +0,0 @@
-#
-# We are building GCC with make and Clang with ninja, the combinations are more
-# or less arbitrarily chosen. We just want to check that both compilers and both
-# CMake generators work. It's unlikely that a specific generator only breaks
-# with a specific compiler.
-#
-
-workspace:
-  base: /drone
-  path: src/github.com/owncloud/client
-
-branches:
-  - master
-  - 2.4
-
-clone:
-  git:
-    image: plugins/git
-    pull: true
-    tags: false
-
-pipeline:
-  prepare-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - mkdir clang-build
-      - cd clang-build
-      - cmake -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
-
-  building-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd clang-build
-      - ninja -j4
-
-  testing-clang:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd clang-build
-      - useradd -m -s /bin/bash tester
-      - chown -R tester:tester .
-      - su-exec tester ctest --output-on-failure
-
-  prepare-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - mkdir gcc-build
-      - cd gcc-build
-      - cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
-
-  building-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd gcc-build
-      - make -j4
-
-  testing-gcc:
-    image: owncloudci/client:latest
-    pull: true
-    environment:
-      - LC_ALL=C.UTF-8
-    commands:
-      - cd gcc-build
-      - useradd -m -s /bin/bash tester
-      - chown -R tester:tester .
-      - su-exec tester ctest --output-on-failure
-
-  notify-slack:
-    image: plugins/slack
-    pull: true
-    secrets: [ slack_webhook ]
-    channel: desktop
-    when:
-      local: false
-      status: [ changed, failure ]
-      event: [ push ]
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,37 @@
+sudo: required
+
+language: cpp
+
+services:
+  - docker
+
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get -y build-dep owncloud-client
+- checkout=$(git show-ref --head --hash head)
+- cd ../
+- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
+- mkdir coverity
+- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
+- export PATH=$PATH:$PWD/coverity/bin/
+- cd $TRAVIS_BUILD_DIR
+
+install:
+- cd ../
+- mkdir client-build
+- cd client-build
+- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
+- cov-build --dir cov-int make
+- tar czvf client.tgz cov-int 
+- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
+
+# Hack to stop processing
+script: true
--- a/38
+++ b/38
@@ -1,43 +1,7 @@
 ChangeLog
 =========

-version 2.4.2 (2018-06-xx)
-* Linux: Tray workarounds (#6545)
-* Fix nautilus/nemo shell issues (#6393, #6406)
-* Updater: Add update channel feature (#6259)
-* Updater: Support EXE->MSI upgrade
-* SyncJournal: Fixes for sync folders on removable media (#6049, #6049)
-* SslButton: Add HTTP/2 info (#3146)
-* Fix assert when using ownCloud server 5 (which you should not) (#6403)
-* Normalize local path (#4424)
-* Blacklisting must prevent parent etag updates (#6411)
-* macdeployqt: Adjust minimum version based on our Qt (#5932)
-* macOS: Unload the Finder extension on exit (#5382, #3819)
-* Upload: Adjust timeout for final job based on file size (#6527)
-* Sync: When detecting a local move, keep the local mtime (#6629)
-* Credentials: Retry fetching from the keychain in case the keychain is still starting (#4274, #6522)
-* OAuth2: Try to refresh the token even if the credentials weren't ready (#6522)
-
-version 2.4.1 (2018-02-xx)
-* Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
-* Issues: Speed up insertion and add hard upper limit (#6272)
-* Notifications: Fix "Dismiss" action
-* Notifications: Fix timer invocation on macOS
-* Notifications: Immediately poll when account online
-* Protocol: Remove entries for auto resolved conflicts (#6316)
-* owncloudcmd: Set proxy before capabilities call (#6281)
-* owncloudcmd: Do not do the capability call when --nonshib is passed
-* Avatars: Use old location for servers <10 (#6279)
-* Link shares: Change default share name (#6298)
-* Sharing: Use maximum allowed permissions for new share (#6346)
-* Nautilus integration: Work with python2 and python3
-* Windows: Don't delete contents behind directory junctions (#6322)
-* SyncJournal: Don't use LIKE with paths (#6322)
-* Fix setting launch-on-startup when the first account is set up (#6347)
-* HTTP2: Only allow with Qt 5.9.4 (#6285)
-* Crash fixes
-
-version 2.4.0 (2017-12-21)
+version 2.4.0 (2017-12-XX)
 * If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
 * OAuth2 authentication support by opening external browser (#5668)
 * Shibboleth: Change to use OAuth2 if supported (#6198)
--- a/51
+++ b/51
@@ -0,0 +1,51 @@
+#!groovy
+
+//
+// We now run the tests in Debug mode so that ASSERTs are triggered.
+// Ideally we should run the tests in both Debug and Release so we catch
+// all possible error combinations.
+// See also the top comment in syncenginetestutils.h
+//
+
+node('CLIENT') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'Qt5'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 -DWITH_TESTING=1 -DCMAKE_PREFIX_PATH=/var/lib/jenkins/qt/5.6.2 ..
+		make -j4
+		ctest -V --output-on-failure'''
+
+    stage 'Qt5 - clang'
+        sh '''rm -rf build
+		mkdir build
+		cd build
+		cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DWITH_TESTING=1 -DCMAKE_PREFIX_PATH=/var/lib/jenkins/qt/5.6.2 ..
+		make -j4
+		ctest -V --output-on-failure'''
+
+
+    stage 'Win32'
+	def win32 = docker.image('guruz/docker-owncloud-client-win32:latest')
+	win32.pull() // make sure we have the latest available from Docker Hub
+	win32.inside {
+		sh '''
+		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 .
+		'''
+	}
+
+   // Stage 'macOS' TODO
+}
+
+
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -19,4 +19,4 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back

 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ownCloud Desktop Client

-[![Build Status](https://drone.owncloud.com/api/badges/owncloud/client/status.svg)](https://drone.owncloud.com/owncloud/client)
+[![Build Status](https://jenkins.owncloud.org/buildStatus/icon?job=owncloud-client/client/master)](https://jenkins.owncloud.org/job/owncloud-client/job/client/job/master/)

 ## Introduction

--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 4 )
-set( MIRALL_VERSION_PATCH 2 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_YEAR  2017 )
 set( MIRALL_SOVERSION 0 )

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -11,7 +11,6 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()

-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj

 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -22,7 +22,6 @@ import subprocess
 import commands
 import sys
 from glob import glob
-from distutils.version import LooseVersion

 def QueryQMake(attrib):
    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -93,8 +92,6 @@ commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];

-qt_version = QueryQMake('QT_VERSION')
-print "Using Qt", qt_version

 fixed_libraries = []
 fixed_frameworks = []
@@ -337,19 +334,9 @@ def FindQtPlugin(name):
 for binary in binaries:
  FixBinary(binary)

-
-if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
-  QT_PLUGINS.append('styles/libqmacstyle.dylib')
 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

-if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-else:
-  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
-  commands.append(args)
-
 if len(sys.argv) <= 2:
  print 'Will run %d commands:' % len(commands)
  for command in commands:
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,9 +27,11 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
        <key>SUShowReleaseNotes</key>
        <false/>
+        <key>LSMinimumBundleVersion</key>
+        <string>10.7.0</string>
        <key>SUPublicDSAKeyFile</key>
        <string>dsa_pub.pem</string>
 </dict>
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -98,270 +98,6 @@ X-GNOME-Autostart-Delay=3
 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -445,11 +181,6 @@ Icon[it]=@APPLICATION_EXECUTABLE@
 Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 GenericName[ko]=폴더 동기화
 Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
-Icon[ko]=@APPLICATION_EXECUTABLE@
-Comment[lo]=@APPLICATION_NAME@ ການປະສານຂໍ້ມູນຄອມພິວເຕີລູກຂ່າຍ
-GenericName[lo]=ໂຟນເດີຊິງ
-Name[lo]=@APPLICATION_NAME@ ຊິງຄອມພິວເຕີລູກຂ່າຍ 
-Icon[lo]=@APPLICATION_EXECUTABLE@
 Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizációs kliens
 GenericName[hu_HU]=Könyvtár szinkronizálás
 Name[hu_HU]=@APPLICATION_NAME@ asztali szinkr. kliens
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -15,13 +15,8 @@
 # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 # for more details.

-import sys
-python3 = sys.version_info[0] >= 3
-
 import os
 import urllib
-if python3:
-    import urllib.parse
 import socket
 import tempfile

@@ -34,15 +29,12 @@ from gi.repository import GObject, Nautilus
 appname = 'ownCloud'

 print("Initializing "+appname+"-client-nautilus extension")
-print("Using python version {}".format(sys.version_info))
+

 def get_local_path(url):
    if url[0:7] == 'file://':
        url = url[7:]
-    if python3:
-        return urllib.parse.unquote(url)
-    else:
-        return urllib.unquote(url).decode('utf-8')
+    return urllib.unquote(url)

 def get_runtime_dir():
    """Returns the value of $XDG_RUNTIME_DIR, a directory path.
@@ -64,7 +56,7 @@ class SocketConnect(GObject.GObject):
        self._watch_id = 0
        self._sock = None
        self._listeners = [self._update_registered_paths]
-        self._remainder = ''.encode('utf-8')
+        self._remainder = ''
        self.nautilusVFSFile_table = {}  # not needed in this object actually but shared 
                                         # all over the other objects.

@@ -82,7 +74,7 @@ class SocketConnect(GObject.GObject):
        # print("Server command: " + cmd)
        if self.connected:
            try:
-                self._sock.send(cmd.encode('utf-8'))
+                self._sock.send(cmd)
            except:
                print("Sending failed.")
                self.reconnect()
@@ -97,15 +89,18 @@ class SocketConnect(GObject.GObject):
            self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
            sock_file = os.path.join(get_runtime_dir(), appname, "socket")
            try:
+                print("Socket File: " + sock_file)
                self._sock.connect(sock_file) # fails if sock_file doesn't exist
                self.connected = True
+                print("Setting connected to %r." % self.connected )
                self._watch_id = GObject.io_add_watch(self._sock, GObject.IO_IN, self._handle_notify)
+                print("Socket watch id: " + str(self._watch_id))

                self.sendCommand('GET_STRINGS:\n')

                return False  # Don't run again
            except Exception as e:
-                print("Could not connect to unix socket " + sock_file + ". " + str(e))
+                print("Could not connect to unix socket. " + str(e))
        except Exception as e:  # Bad habbit
            print("Connect could not be established, try again later.")
            self._sock.close()
@@ -118,24 +113,24 @@ class SocketConnect(GObject.GObject):
        # Prepend the remaining data from last call
        if len(self._remainder) > 0:
            data = self._remainder + data
-            self._remainder = ''.encode('utf-8')
+            self._remainder = ''

        if len(data) > 0:
            # Remember the remainder for next round
-            lastNL = data.rfind('\n'.encode('utf-8'));
+            lastNL = data.rfind('\n');
            if lastNL > -1 and lastNL < len(data):
                self._remainder = data[lastNL+1:]
                data = data[:lastNL]

-            for l in data.split('\n'.encode('utf-8')):
-                self._handle_server_response(l.decode('utf-8'))
+            for l in data.split('\n'):
+                self._handle_server_response(l)
        else:
            return False

        return True  # Run again

    def _handle_server_response(self, line):
-        # print("Server response: " + line)
+        print("Server response: " + line)
        parts = line.split(':')
        action = parts[0]
        args = parts[1:]
@@ -262,11 +257,11 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):

    def context_menu_action(self, menu, action, file):
        filename = get_local_path(file.get_uri())
-        # print("Context menu: " + action + ' ' + filename)
+        print("Context menu: " + action + ' ' + filename)
        socketConnect.sendCommand(action + ":" + filename + "\n")


-class SyncStateExtension(GObject.GObject, Nautilus.InfoProvider):
+class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.InfoProvider):
    def __init__(self):
        GObject.GObject.__init__(self)

--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -420,6 +420,46 @@ int main(int argc, char **argv)
        folder.chop(1);
    }

+    SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;
+
+    HttpCredentialsText *cred = new HttpCredentialsText(user, password);
+
+    if (options.trustSSL) {
+        cred->setSSLTrusted(true);
+    }
+    account->setUrl(url);
+    account->setCredentials(cred);
+    account->setSslErrorHandler(sslErrorHandler);
+
+    //obtain capabilities using event loop
+    QEventLoop loop;
+
+    JsonApiJob *job = new JsonApiJob(account, QLatin1String("ocs/v1.php/cloud/capabilities"));
+    job->setTimeout(timeoutToUseMsec);
+    QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QJsonDocument &json) {
+        auto caps = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
+        qDebug() << "Server capabilities" << caps;
+        account->setCapabilities(caps.toVariantMap());
+        loop.quit();
+    });
+    job->start();
+
+    loop.exec();
+
+    if (job->reply()->error() != QNetworkReply::NoError){
+        std::cout<<"Error connecting to server\n";
+        return EXIT_FAILURE;
+    }
+
+    // much lower age than the default since this utility is usually made to be run right after a change in the tests
+    SyncEngine::minimumFileAgeForUpload = 0;
+
+    int restartCount = 0;
+restart_sync:
+
+
+    opts = &options;
+
    if (!options.proxy.isNull()) {
        QString host;
        int port = 0;
@@ -437,58 +477,16 @@ int main(int argc, char **argv)

            QNetworkProxyFactory::setUseSystemConfiguration(false);
            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port));
-        } else {
-            qFatal("Could not read httpproxy. The proxy should have the format \"http://hostname:port\".");
        }
    } else {
        clientProxy.setupQtProxyFromConfig();
-    }
-
-    SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;
-
-    HttpCredentialsText *cred = new HttpCredentialsText(user, password);
-
-    if (options.trustSSL) {
-        cred->setSSLTrusted(true);
-    }
-    account->setUrl(url);
-    account->setCredentials(cred);
-    account->setSslErrorHandler(sslErrorHandler);
-
-    // Perform a call to get the capabilities.
-    if (!options.nonShib) {
-        // Do not do it if '--nonshib' was passed. This mean we should only connect to the 'nonshib'
-        // dav endpoint. Since we do not get the capabilities, in that case, this has the additional
-        // side effect that chunking-ng will be disabled. (because otherwise it would use the new
-        // 'dav' endpoint instead of the nonshib one (which still use the old chunking)
-
-        QEventLoop loop;
-        JsonApiJob *job = new JsonApiJob(account, QLatin1String("ocs/v1.php/cloud/capabilities"));
-        job->setTimeout(timeoutToUseMsec);
-        QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QJsonDocument &json) {
-            auto caps = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
-            qDebug() << "Server capabilities" << caps;
-            account->setCapabilities(caps.toVariantMap());
-            loop.quit();
-        });
-        job->start();
-
-        loop.exec();
-
-        if (job->reply()->error() != QNetworkReply::NoError){
-            std::cout<<"Error connecting to server\n";
-            return EXIT_FAILURE;
+        QString url(options.target_url);
+        if (url.startsWith("owncloud")) {
+            url.remove(0, 8);
+            url = QString("http%1").arg(url);
        }
    }

-    // much lower age than the default since this utility is usually made to be run right after a change in the tests
-    SyncEngine::minimumFileAgeForUpload = 0;
-
-    int restartCount = 0;
-restart_sync:
-
-    opts = &options;
-
    QStringList selectiveSyncList;
    if (!options.unsyncedfolders.isEmpty()) {
        QFile f(options.unsyncedfolders);
--- a/src/common/filesystembase.cpp
+++ b/src/common/filesystembase.cpp
@@ -478,22 +478,4 @@ bool FileSystem::isLnkFile(const QString &filename)
    return filename.endsWith(".lnk");
 }

-bool FileSystem::isJunction(const QString &filename)
-{
-#ifdef Q_OS_WIN
-    WIN32_FIND_DATA findData;
-    HANDLE hFind = FindFirstFileEx((const wchar_t *)filename.utf16(), FindExInfoBasic, &findData, FindExSearchNameMatch, NULL, 0);
-    if (hFind != INVALID_HANDLE_VALUE) {
-        FindClose(hFind);
-        return false;
-    }
-    return findData.dwFileAttributes != INVALID_FILE_ATTRIBUTES
-        && findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT
-        && findData.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT;
-#else
-    Q_UNUSED(filename);
-    return false;
-#endif
-}
-
 } // namespace OCC
--- a/src/common/filesystembase.h
+++ b/src/common/filesystembase.h
@@ -141,16 +141,8 @@ namespace FileSystem {
     */
    bool OCSYNC_EXPORT isFileLocked(const QString &fileName);

-    /**
-     * Returns whether the file is a shortcut file (ends with .lnk)
-     */
    bool OCSYNC_EXPORT isLnkFile(const QString &filename);

-    /**
-     * Returns whether the file is a junction (windows only)
-     */
-    bool OCSYNC_EXPORT isJunction(const QString &filename);
-
    /*
     * This function takes a path and converts it to a UNC representation of the
     * string. That means that it prepends a \\?\ (unless already UNC) and converts
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -32,13 +32,6 @@

 #include "common/c_jhash.h"

-// SQL expression to check whether path.startswith(prefix + '/')
-// Note: '/' + 1 == '0'
-#define IS_PREFIX_PATH_OF(prefix, path) \
-    "(" path " > (" prefix "||'/') AND " path " < (" prefix "||'0'))"
-#define IS_PREFIX_PATH_OR_EQUAL(prefix, path) \
-    "(" path " == " prefix " OR " IS_PREFIX_PATH_OF(prefix, path) ")"
-
 namespace OCC {

 Q_LOGGING_CATEGORY(lcDb, "sync.database", QtInfoMsg)
@@ -65,7 +58,7 @@ static void fillFileRecordFromGetQuery(SyncJournalFileRecord &rec, SqlQuery &que

 static QString defaultJournalMode(const QString &dbPath)
 {
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
    // 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);
@@ -74,11 +67,6 @@ static QString defaultJournalMode(const QString &dbPath)
        qCInfo(lcDb) << "Filesystem contains FAT - using DELETE journal mode";
        return "DELETE";
    }
-#elif defined(Q_OS_MAC)
-    if (dbPath.startsWith("/Volumes/")) {
-        qCInfo(lcDb) << "Mounted sync dir, do not use WAL for" << dbPath;
-        return "DELETE";
-    }
 #else
    Q_UNUSED(dbPath)
 #endif
@@ -276,11 +264,6 @@ bool SyncJournalDb::sqlFail(const QString &log, const SqlQuery &query)
 bool SyncJournalDb::checkConnect()
 {
    if (_db.isOpen()) {
-        if (!QFile::exists(_dbFile)) {
-            qCWarning(lcDb) << "Database open, but file file" + _dbFile + " does not exist";
-            close();
-            return false;
-        }
        return true;
    }

@@ -567,7 +550,7 @@ bool SyncJournalDb::checkConnect()
    _getFilesBelowPathQuery.reset(new SqlQuery(_db));
    if (_getFilesBelowPathQuery->prepare(
            GET_FILE_RECORD_QUERY
-            " WHERE " IS_PREFIX_PATH_OF("?1", "path") " ORDER BY path||'/' ASC")) {
+            " WHERE path > (?1||'/') AND path < (?1||'0') ORDER BY path||'/' ASC")) {
        return sqlFail("prepare _getFilesBelowPathQuery", *_getFilesBelowPathQuery);
    }

@@ -637,7 +620,7 @@ bool SyncJournalDb::checkConnect()
    }

    _deleteFileRecordRecursively.reset(new SqlQuery(_db));
-    if (_deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE " IS_PREFIX_PATH_OF("?1", "path"))) {
+    if (_deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')")) {
        return sqlFail("prepare _deleteFileRecordRecursively", *_deleteFileRecordRecursively);
    }

@@ -1797,8 +1780,9 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)
    }

    SqlQuery query(_db);
-    query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE " IS_PREFIX_PATH_OR_EQUAL("?1", "path"));
+    query.prepare("UPDATE metadata SET fileid = '', inode = '0' WHERE path == ?1 OR path LIKE(?2||'/%')");
    query.bindValue(1, path);
+    query.bindValue(2, path);
    query.exec();

    // We also need to remove the ETags so the update phase refreshes the directory paths
@@ -1808,28 +1792,25 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)

 void SyncJournalDb::avoidReadFromDbOnNextSync(const QByteArray &fileName)
 {
+    // Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
+    // get the info from the server
+    // We achieve that by clearing the etag of the parents directory recursively
+
    QMutexLocker locker(&_mutex);

    if (!checkConnect()) {
        return;
    }

-    // Remove trailing slash
-    auto argument = fileName;
-    if (argument.endsWith('/'))
-        argument.chop(1);
-
    SqlQuery query(_db);
    // This query will match entries for which the path is a prefix of fileName
    // Note: CSYNC_FTW_TYPE_DIR == 2
-    query.prepare("UPDATE metadata SET md5='_invalid_' WHERE " IS_PREFIX_PATH_OR_EQUAL("path", "?1") " AND type == 2;");
-    query.bindValue(1, argument);
+    query.prepare("UPDATE metadata SET md5='_invalid_' WHERE ?1 LIKE(path||'/%') AND type == 2;");
+    query.bindValue(1, fileName);
    query.exec();

-    // Prevent future overwrite of the etags of this folder and all
-    // parent folders for this sync
-    argument.append('/');
-    _avoidReadFromDbOnNextSyncFilter.append(argument);
+    // Prevent future overwrite of the etag for this sync
+    _avoidReadFromDbOnNextSyncFilter.append(fileName);
 }

 void SyncJournalDb::forceRemoteDiscoveryNextSync()
--- a/src/common/syncjournaldb.h
+++ b/src/common/syncjournaldb.h
@@ -158,16 +158,15 @@ public:
    void setSelectiveSyncList(SelectiveSyncListType type, const QStringList &list);

    /**
-     * Make sure that on the next sync fileName and its parents are discovered from the server.
+     * Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
+     * get the info from the server
     *
-     * That means its metadata and, if it's a directory, its direct contents.
-     *
-     * Specifically, etag (md5 field) of fileName and all its parents are set to _invalid_.
+     * Specifically, this sets the md5 field of fileName and all its parents to _invalid_.
     * That causes a metadata difference and a resulting discovery from the remote for the
     * affected folders.
     *
     * Since folders in the selective sync list will not be rediscovered (csync_ftw,
-     * _csync_detect_update skip them), the _invalid_ marker will stay. And any
+     * _csync_detect_update skip them), the _invalid_ marker will stay and it. And any
     * child items in the db will be ignored when reading a remote tree from the database.
     */
    void avoidReadFromDbOnNextSync(const QString &fileName) { avoidReadFromDbOnNextSync(fileName.toUtf8()); }
@@ -269,8 +268,6 @@ private:
    /* This is the list of paths we called avoidReadFromDbOnNextSync on.
     * It means that they should not be written to the DB in any case since doing
     * that would write the etag and would void the purpose of avoidReadFromDbOnNextSync
-     *
-     * The contained paths have a trailing /.
     */
    QList<QByteArray> _avoidReadFromDbOnNextSyncFilter;

--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -1,6 +1,13 @@
 PROJECT( CrashReporter )
 cmake_policy(SET CMP0017 NEW)

+list(APPEND crashreporter_SOURCES main.cpp)
+list(APPEND crashreporter_RC resources.qrc)
+
+qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
+qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )
+
+
 # TODO: differentiate release channel
 # if(BUILD_RELEASE)
 #     set(CRASHREPORTER_RELEASE_CHANNEL "release")
@@ -8,30 +15,9 @@ cmake_policy(SET CMP0017 NEW)
     set(CRASHREPORTER_RELEASE_CHANNEL "nightly")
 # endif()

-# Theme
-if(DEFINED OEM_THEME_DIR AND EXISTS "${OEM_THEME_DIR}/theme/colored")
-    set(CRASHREPORTER_ICON_DIR "${OEM_THEME_DIR}/theme/colored")
-else()
-    set(CRASHREPORTER_ICON_DIR "${CMAKE_SOURCE_DIR}/theme/colored")
-endif()
-
-set(CRASHREPORTER_ICON_FILENAME "${APPLICATION_ICON_NAME}-icon.png")
-set(CRASHREPORTER_ICON ":/${CRASHREPORTER_ICON_FILENAME}")
-set(CRASHREPORTER_ICON_SIZE "128")
-set(CRASHREPORTER_ICON_PATH "${CRASHREPORTER_ICON_DIR}/${APPLICATION_ICON_NAME}-icon-${CRASHREPORTER_ICON_SIZE}.png")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc.in
-               ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h)

-# Sources
-list(APPEND crashreporter_SOURCES main.cpp)
-list(APPEND crashreporter_RC "${CMAKE_CURRENT_BINARY_DIR}/resources.qrc")
-
-qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
-qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )

 include_directories(${CMAKE_CURRENT_BINARY_DIR}
    "../3rdparty/libcrashreporter-qt/src/"
--- a/src/crashreporter/resources.qrc
+++ b/src/crashreporter/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="owncloud-icon.png">../../theme/colored/owncloud-icon-128.png</file>
+    </qresource>
+</RCC>
--- a/src/crashreporter/resources.qrc.in
+++ b/src/crashreporter/resources.qrc.in
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="@CRASHREPORTER_ICON_FILENAME@">@CRASHREPORTER_ICON_PATH@</file>
-    </qresource>
-</RCC>
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -85,8 +85,6 @@ int csync_update(CSYNC *ctx) {
  csync_gettime(&start);
  ctx->current = LOCAL_REPLICA;

-  CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "## Starting local discovery ##");
-
  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
    if(ctx->status_code == CSYNC_STATUS_OK) {
@@ -106,8 +104,6 @@ int csync_update(CSYNC *ctx) {
  csync_gettime(&start);
  ctx->current = REMOTE_REPLICA;

-  CSYNC_LOG(CSYNC_LOG_PRIORITY_INFO, "## Starting remote discovery ##");
-
  rc = csync_ftw(ctx, "", csync_walker, MAX_DEPTH);
  if (rc < 0) {
      if(ctx->status_code == CSYNC_STATUS_OK) {
--- a/src/csync/csync_reconcile.cpp
+++ b/src/csync/csync_reconcile.cpp
@@ -156,7 +156,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                /* First, check that the file is NOT in our tree (another file with the same name was added) */
                if (our_tree->findFile(basePath)) {
                    other = nullptr;
-                    qCInfo(lcReconcile, "Origin found in our tree : %s", basePath.constData());
+                    qCDebug(lcReconcile, "Origin found in our tree : %s", basePath.constData());
                } else {
                    /* Find the potential rename source file in the other tree.
                    * If the renamed file could not be found in the opposite tree, that is because it
@@ -164,7 +164,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    * The journal is cleaned up later after propagation.
                    */
                    other = other_tree->findFile(basePath);
-                    qCInfo(lcReconcile, "Rename origin in other tree (%s) %s",
+                    qCDebug(lcReconcile, "Rename origin in other tree (%s) %s",
                        basePath.constData(), other ? "found" : "not found");
                }

@@ -175,7 +175,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    // Some other EVAL_RENAME already claimed other.
                    // We do nothing: maybe a different candidate for
                    // other is found as well?
-                    qCInfo(lcReconcile, "Other has already been renamed to %s",
+                    qCDebug(lcReconcile, "Other has already been renamed to %s",
                        other->rename_path.constData());
                } else if (cur->type == CSYNC_FTW_TYPE_DIR
                    // The local replica is reconciled first, so the remote tree would
@@ -187,17 +187,13 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    || other->instruction == CSYNC_INSTRUCTION_NONE
                    || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
                    || other->instruction == CSYNC_INSTRUCTION_REMOVE) {
-                    qCInfo(lcReconcile, "Switching %s to RENAME to %s",
+                    qCDebug(lcReconcile, "Switching %s to RENAME to %s",
                        other->path.constData(), cur->path.constData());
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
                    other->rename_path = cur->path;
                    if( !cur->file_id.isEmpty() ) {
                        other->file_id = cur->file_id;
                    }
-                    if (ctx->current == LOCAL_REPLICA) {
-                        // Keep the local mtime.
-                        other->modtime = cur->modtime;
-                    }
                    other->inode = cur->inode;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                    // We have consumed 'other': exit this loop to not consume another one.
@@ -211,7 +207,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    // Local: The remote reconcile will be able to deal with this.
                    // Remote: The local replica has already dealt with this.
                    //         See the EVAL_RENAME case when other was found directly.
-                    qCInfo(lcReconcile, "File in a renamed directory, other side's instruction: %d",
+                    qCDebug(lcReconcile, "File in a renamed directory, other side's instruction: %d",
                        other->instruction);
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else {
@@ -219,7 +215,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                    // and the instruction in the local tree is NEW while cur has EVAL_RENAME
                    // due to a remote move of the same file. In these scenarios we just
                    // want the instruction to stay NEW.
-                    qCInfo(lcReconcile, "Other already has instruction %d",
+                    qCDebug(lcReconcile, "Other already has instruction %d",
                        other->instruction);
                }
            };
@@ -227,7 +223,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
            if (ctx->current == LOCAL_REPLICA) {
                /* use the old name to find the "other" node */
                OCC::SyncJournalFileRecord base;
-                qCInfo(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
+                qCDebug(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
                    cur->inode);
                ctx->statedb->getFileRecordByInode(cur->inode, &base);
                renameCandidateProcessing(base._path);
@@ -240,7 +236,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {
                // line.
                auto basePath = csync_rename_adjust_full_path_source(ctx, cur->path);
                if (basePath != cur->path) {
-                    qCInfo(lcReconcile, "Trying rename origin by csync_rename mapping %s",
+                    qCDebug(lcReconcile, "Trying rename origin by csync_rename mapping %s",
                        basePath.constData());
                    // We go through getFileRecordsByFileId to ensure the basePath
                    // computed in this way also has the expected fileid.
@@ -253,7 +249,7 @@ static int _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx) {

                // Also feed all the other files with the same fileid if necessary
                if (!processedRename) {
-                    qCInfo(lcReconcile, "Finding rename origin through file ID %s",
+                    qCDebug(lcReconcile, "Finding rename origin through file ID %s",
                        cur->file_id.constData());
                    ctx->statedb->getFileRecordsByFileId(cur->file_id,
                        [&](const OCC::SyncJournalFileRecord &base) { renameCandidateProcessing(base._path); });
--- a/src/csync/csync_update.cpp
+++ b/src/csync/csync_update.cpp
@@ -130,12 +130,12 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
       * This code should probably be in csync_exclude, but it does not have the fs parameter.
       * Keep it here for now */
      if (ctx->ignore_hidden_files && (fs->is_hidden)) {
-          qCInfo(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
+          qCDebug(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
          excluded = CSYNC_FILE_EXCLUDE_HIDDEN;
      }
  } else {
      /* File is ignored because it's matched by a user- or system exclude pattern. */
-      qCInfo(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
+      qCDebug(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
      if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
          return 1;
      }
@@ -150,25 +150,17 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      }
  }

-  auto localCodec = QTextCodec::codecForLocale();
-  if (ctx->current == REMOTE_REPLICA && localCodec->mibEnum() != 106) {
+  if (ctx->current == REMOTE_REPLICA && QTextCodec::codecForLocale()->mibEnum() != 106) {
      /* If the locale codec is not UTF-8, we must check that the filename from the server can
-       * be encoded in the local file system.
-       *
-       * We cannot use QTextCodec::canEncode() since that can incorrectly return true, see
-       * https://bugreports.qt.io/browse/QTBUG-6925.
-       */
-      QTextEncoder encoder(localCodec, QTextCodec::ConvertInvalidToNull);
-      if (encoder.fromUnicode(QString::fromUtf8(fs->path)).contains('\0')) {
-          qCInfo(lcUpdate, "cannot encode %s to local encoding %d",
-              fs->path.constData(), localCodec->mibEnum());
+       * be encoded in the local file system. */
+      if (!QTextCodec::codecForLocale()->canEncode(QString::fromUtf8(fs->path))) {
          excluded = CSYNC_FILE_EXCLUDE_CANNOT_ENCODE;
      }
  }

  if (fs->type == CSYNC_FTW_TYPE_FILE ) {
    if (fs->modtime == 0) {
-      qCInfo(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
+      qCDebug(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
    }
  }

@@ -195,12 +187,10 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      /* we have an update! */
      qCInfo(lcUpdate, "Database entry found, compare: %" PRId64 " <-> %" PRId64
                                          ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
-                                          ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x"
-                                          ", checksum: %s <-> %s , ignore: %d",
+                                          ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x, ignore: %d",
                ((int64_t) fs->modtime), ((int64_t) base._modtime),
                fs->etag.constData(), base._etag.constData(), (uint64_t) fs->inode, (uint64_t) base._inode,
-                (uint64_t) fs->size, (uint64_t) base._fileSize, *reinterpret_cast<short*>(&fs->remotePerm), *reinterpret_cast<short*>(&base._remotePerm), fs->checksumHeader.constData(),
-                base._checksumHeader.constData(), base._serverHasIgnoredFiles);
+                (uint64_t) fs->size, (uint64_t) base._fileSize, *reinterpret_cast<short*>(&fs->remotePerm), *reinterpret_cast<short*>(&base._remotePerm), base._serverHasIgnoredFiles );
      if (ctx->current == REMOTE_REPLICA && fs->etag != base._etag) {
          fs->instruction = CSYNC_INSTRUCTION_EVAL;

@@ -230,7 +220,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                  checksumIdentical = fs->checksumHeader == base._checksumHeader;
              }
              if (checksumIdentical) {
-                  qCInfo(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
+                  qCDebug(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
                  fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
                  goto out;
              }
@@ -254,7 +244,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
           * The metadata comparison ensure that we fetch all the file id or permission when
           * upgrading owncloud
           */
-          qCInfo(lcUpdate, "Reading from database: %s", fs->path.constData());
+          qCDebug(lcUpdate, "Reading from database: %s", fs->path.constData());
          ctx->remote.read_from_db = true;
      }
      /* If it was remembered in the db that the remote dir has ignored files, store
@@ -265,7 +255,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
      }
      if (metadata_differ) {
          /* file id or permissions has changed. Which means we need to update them in the DB. */
-          qCInfo(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
+          qCDebug(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
          fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
      } else {
          fs->instruction = CSYNC_INSTRUCTION_NONE;
@@ -273,7 +263,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
  } else {
      /* check if it's a file and has been renamed */
      if (ctx->current == LOCAL_REPLICA) {
-          qCInfo(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
+          qCDebug(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);

          OCC::SyncJournalFileRecord base;
          if(!ctx->statedb->getFileRecordByInode(fs->inode, &base)) {
@@ -300,13 +290,13 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                      _rel_to_abs(ctx, fs->path), base._checksumHeader,
                      ctx->callbacks.checksum_userdata);
              if (!fs->checksumHeader.isEmpty()) {
-                  qCInfo(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
+                  qCDebug(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
                  isRename = fs->checksumHeader == base._checksumHeader;
              }
          }

          if (isRename) {
-              qCInfo(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
+              qCDebug(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
              /* inode found so the file has been renamed */
              fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
              if (fs->type == CSYNC_FTW_TYPE_DIR) {
@@ -316,8 +306,6 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
          goto out;

      } else {
-          qCInfo(lcUpdate, "Checking for rename based on fileid %s", fs->file_id.constData());
-
          /* Remote Replica Rename check */
          fs->instruction = CSYNC_INSTRUCTION_NEW;

@@ -354,7 +342,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                  csync_rename_record(ctx, base._path, fs->path);
              }

-              qCInfo(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
+              qCDebug(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
              fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
              done = true;
          };
@@ -462,11 +450,11 @@ int csync_walker(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs) {
      }
      break;
  case CSYNC_FTW_TYPE_SLINK:
-    qCInfo(lcUpdate, "symlink: %s - not supported", fs->path.constData());
+    qCDebug(lcUpdate, "symlink: %s - not supported", fs->path.constData());
    break;
  default:
-    qCInfo(lcUpdate, "item: %s - item type %d not iterated", fs->path.constData(), fs->type);
    return 0;
+    break;
  }

  rc = _csync_detect_update(ctx, std::move(fs));
@@ -487,7 +475,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
         * their correct etags again and we don't run into this case.
         */
        if( rec._etag == "_invalid_") {
-            qCInfo(lcUpdate, "%s selective sync excluded", rec._path.constData());
+            qCDebug(lcUpdate, "%s selective sync excluded", rec._path.constData());
            skipbase = rec._path;
            skipbase += '/';
            return;
@@ -509,7 +497,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
         * without a full remote discovery being triggered. */
        CSYNC_EXCLUDE_TYPE excluded = csync_excluded_traversal(ctx, st->path, st->type);
        if (excluded != CSYNC_NOT_EXCLUDED) {
-            qInfo(lcUpdate, "%s excluded from db read (%d)", st->path.constData(), excluded);
+            qDebug(lcUpdate, "%s excluded (%d)", st->path.constData(), excluded);

            if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE
                    || excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
@@ -528,7 +516,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
        ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
        return false;
    }
-    qInfo(lcUpdate, "%" PRId64 " entries read below path %s from db.", count, uri);
+    qDebug(lcUpdate, "%" PRId64 " entries read below path %s from db.", count, uri);

    return true;
 }
@@ -724,7 +712,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
  }

  csync_vio_closedir(ctx, dh);
-  qCInfo(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
+  qCDebug(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);

  return rc;

--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -136,7 +136,7 @@ IF( APPLE )
    if(SPARKLE_FOUND)
       # Define this, we need to check in updater.cpp
       add_definitions( -DHAVE_SPARKLE )
-       list(APPEND updater_SRCS updater/sparkleupdater_mac.mm updater/sparkleupdater.h)
+       list(APPEND updater_SRCS updater/sparkleupdater_mac.mm)
   endif()
 ENDIF()

--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -312,10 +312,10 @@ void AccountState::slotInvalidCredentials()

    if (account()->credentials()->ready()) {
        account()->credentials()->invalidateToken();
-    }
-    if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
-        if (creds->refreshAccessToken())
-            return;
+        if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
+            if (creds->refreshAccessToken())
+                return;
+        }
    }
    account()->credentials()->askFromUser();
 }
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -338,9 +338,7 @@ void Application::slotownCloudWizardDone(int res)
        shouldSetAutoStart = shouldSetAutoStart
            && QCoreApplication::applicationDirPath().startsWith("/Applications/");
 #endif
-        if (shouldSetAutoStart) {
-            Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), true);
-        }
+        Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), shouldSetAutoStart);

        _gui->slotShowSettings();
    }
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -121,10 +121,6 @@ void Folder::checkLocalPath()
 {
    const QFileInfo fi(_definition.localPath);
    _canonicalLocalPath = fi.canonicalFilePath();
-#ifdef Q_OS_MAC
-    // Workaround QTBUG-55896  (Should be fixed in Qt 5.8)
-    _canonicalLocalPath = _canonicalLocalPath.normalized(QString::NormalizationForm_C);
-#endif
    if (_canonicalLocalPath.isEmpty()) {
        qCWarning(lcFolder) << "Broken symlink:" << _definition.localPath;
        _canonicalLocalPath = _definition.localPath;
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -568,12 +568,10 @@ void FolderWizard::resizeEvent(QResizeEvent *event)
    QWizard::resizeEvent(event);

    // workaround for QTBUG-22819: when the error label word wrap, the minimum height is not adjusted
-    if (auto page = currentPage()) {
-        int hfw = page->heightForWidth(page->width());
-        if (page->height() < hfw) {
-            page->setMinimumSize(page->minimumSizeHint().width(), hfw);
-            setTitleFormat(titleFormat()); // And another workaround for QTBUG-3396
-        }
+    int hfw = currentPage()->heightForWidth(currentPage()->width());
+    if (currentPage()->height() < hfw) {
+        currentPage()->setMinimumSize(currentPage()->minimumSizeHint().width(), hfw);
+        setTitleFormat(titleFormat()); // And another workaround for QTBUG-3396
    }
 }

--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -25,10 +25,6 @@

 #include "updater/updater.h"
 #include "updater/ocupdater.h"
-#ifdef Q_OS_MAC
-// FIXME We should unify those, but Sparkle does everything behind the scene transparently
-#include "updater/sparkleupdater.h"
-#endif
 #include "ignorelisteditor.h"

 #include "config.h"
@@ -36,7 +32,6 @@
 #include <QNetworkProxy>
 #include <QDir>
 #include <QScopedValueRollback>
-#include <QMessageBox>

 namespace OCC {

@@ -93,18 +88,6 @@ GeneralSettings::GeneralSettings(QWidget *parent)

    // accountAdded means the wizard was finished and the wizard might change some options.
    connect(AccountManager::instance(), &AccountManager::accountAdded, this, &GeneralSettings::loadMiscSettings);
-
-    // Only our standard brandings currently support beta channel
-    Theme *theme = Theme::instance();
-    if (theme->appName() != QLatin1String("ownCloud") && theme->appName() != QLatin1String("testpilotcloud") ) {
-#ifdef Q_OS_MAC
-        // Because we don't have any statusString from the SparkleUpdater anyway we can hide the whole thing
-        _ui->updatesGroupBox->hide();
-#else
-        _ui->updateChannelLabel->hide();
-        _ui->updateChannel->hide();
-#endif
-    }
 }

 GeneralSettings::~GeneralSettings()
@@ -134,79 +117,22 @@ void GeneralSettings::loadMiscSettings()

 void GeneralSettings::slotUpdateInfo()
 {
-    if (ConfigFile().skipUpdateCheck() || !Updater::instance()) {
-        // updater disabled on compile
-        _ui->updatesGroupBox->setVisible(false);
-        return;
-    }
-
    // Note: the sparkle-updater is not an OCUpdater
-    OCUpdater *ocupdater = qobject_cast<OCUpdater *>(Updater::instance());
-    if (ocupdater) {
-        connect(ocupdater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
-        connect(_ui->restartButton, &QAbstractButton::clicked, ocupdater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
+    OCUpdater *updater = qobject_cast<OCUpdater *>(Updater::instance());
+    if (ConfigFile().skipUpdateCheck()) {
+        updater = 0; // don't show update info if updates are disabled
+    }
+
+    if (updater) {
+        connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
+        connect(_ui->restartButton, &QAbstractButton::clicked, updater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
-
-        _ui->updateStateLabel->setText(ocupdater->statusString());
-        _ui->restartButton->setVisible(ocupdater->downloadState() == OCUpdater::DownloadComplete);
-
+        _ui->updateStateLabel->setText(updater->statusString());
+        _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
+    } else {
+        // can't have those infos from sparkle currently
+        _ui->updatesGroupBox->setVisible(false);
    }
-#ifdef Q_OS_MAC
-    else if (SparkleUpdater *sparkleUpdater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
-        _ui->updateStateLabel->setText(sparkleUpdater->statusString());
-        _ui->restartButton->setVisible(false);
-    }
-#endif
-
-    // Channel selection
-    _ui->updateChannel->setCurrentIndex(ConfigFile().updateChannel() == "beta" ? 1 : 0);
-    connect(_ui->updateChannel, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-        this, &GeneralSettings::slotUpdateChannelChanged, Qt::UniqueConnection);
-}
-
-void GeneralSettings::slotUpdateChannelChanged(int index)
-{
-    QString channel = index == 0 ? QStringLiteral("stable") : QStringLiteral("beta");
-    if (channel == ConfigFile().updateChannel())
-        return;
-
-    auto msgBox = new QMessageBox(
-        QMessageBox::Warning,
-        tr("Change update channel?"),
-        tr("The update channel determines which client updates will be offered "
-           "for installation. The \"stable\" channel contains only upgrades that "
-           "are considered reliable, while the versions in the \"beta\" channel "
-           "may contain newer features and bugfixes, but have not yet been tested "
-           "thoroughly."
-           "\n\n"
-           "Note that this selects only what pool upgrades are taken from, and that "
-           "there are no downgrades: So going back from the beta channel to "
-           "the stable channel usually cannot be done immediately and means waiting "
-           "for a stable version that is newer than the currently installed beta "
-           "version."),
-        QMessageBox::NoButton,
-        this);
-    msgBox->addButton(tr("Change update channel"), QMessageBox::AcceptRole);
-    msgBox->addButton(tr("Cancel"), QMessageBox::RejectRole);
-    connect(msgBox, &QMessageBox::finished, msgBox, [this, channel, msgBox](int result) {
-        msgBox->deleteLater();
-        if (result == QMessageBox::AcceptRole) {
-            ConfigFile().setUpdateChannel(channel);
-            if (OCUpdater *updater = qobject_cast<OCUpdater *>(Updater::instance())) {
-                updater->setUpdateUrl(Updater::updateUrl());
-                updater->checkForUpdate();
-            }
-#ifdef Q_OS_MAC
-            else if (SparkleUpdater *updater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
-                updater->setUpdateUrl(Updater::updateUrl());
-                updater->checkForUpdate();
-            }
-#endif
-        } else {
-            _ui->updateChannel->setCurrentText(ConfigFile().updateChannel());
-        }
-    });
-    msgBox->open();
 }

 void GeneralSettings::saveMiscSettings()
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -44,7 +44,6 @@ private slots:
    void slotToggleLaunchOnStartup(bool);
    void slotToggleOptionalDesktopNotifications(bool);
    void slotUpdateInfo();
-    void slotUpdateChannelChanged(int index);
    void slotIgnoreFilesEditor();
    void loadMiscSettings();

--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>785</width>
-    <height>533</height>
+    <height>523</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -74,88 +74,48 @@
     <property name="title">
      <string>Updates</string>
     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="updateChannelLabel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>&amp;Channel</string>
-          </property>
-          <property name="buddy">
-           <cstring>updateChannel</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="updateChannel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>stable</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>beta</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="updateStateLabel">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-          <property name="openExternalLinks">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="restartButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>&amp;Restart &amp;&amp; Update</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       <widget class="QLabel" name="updateStateLabel">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="restartButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>&amp;Restart &amp;&amp; Update</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Preferred</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
      </item>
     </layout>
    </widget>
@@ -287,10 +247,7 @@
  <tabstop>ignoredFilesButton</tabstop>
  <tabstop>newFolderLimitCheckBox</tabstop>
  <tabstop>newFolderLimitSpinBox</tabstop>
-  <tabstop>newExternalStorage</tabstop>
-  <tabstop>showInExplorerNavigationPaneCheckBox</tabstop>
  <tabstop>crashreporterCheckBox</tabstop>
-  <tabstop>updateChannel</tabstop>
  <tabstop>restartButton</tabstop>
 </tabstops>
 <resources/>
--- a/src/gui/issueswidget.cpp
+++ b/src/gui/issueswidget.cpp
@@ -38,12 +38,6 @@

 namespace OCC {

-/**
- * If more issues are reported than this they will not show up
- * to avoid performance issues around sorting this many issues.
- */
-static const int maxIssueCount = 50000;
-
 IssuesWidget::IssuesWidget(QWidget *parent)
    : QWidget(parent)
    , _ui(new Ui::IssuesWidget)
@@ -102,14 +96,6 @@ IssuesWidget::IssuesWidget(QWidget *parent)
 #if defined(Q_OS_MAC)
    _ui->_treeWidget->setMinimumWidth(400);
 #endif
-
-    _reenableSorting.setInterval(5000);
-    connect(&_reenableSorting, &QTimer::timeout, this,
-        [this]() { _ui->_treeWidget->setSortingEnabled(true); });
-
-    _ui->_tooManyIssuesWarning->hide();
-    connect(this, &IssuesWidget::issueCountUpdated, this,
-        [this](int count) { _ui->_tooManyIssuesWarning->setVisible(count >= maxIssueCount); });
 }

 IssuesWidget::~IssuesWidget()
@@ -167,17 +153,11 @@ void IssuesWidget::addItem(QTreeWidgetItem *item)
    if (!item)
        return;

-    int count = _ui->_treeWidget->topLevelItemCount();
-    if (count >= maxIssueCount)
-        return;
-
-    _ui->_treeWidget->setSortingEnabled(false);
-    _reenableSorting.start();
+    int insertLoc = 0;

    // Insert item specific errors behind the others
-    int insertLoc = 0;
    if (!item->text(1).isEmpty()) {
-        for (int i = 0; i < count; ++i) {
+        for (int i = 0; i < _ui->_treeWidget->topLevelItemCount(); ++i) {
            if (_ui->_treeWidget->topLevelItem(i)->text(1).isEmpty()) {
                insertLoc = i + 1;
            } else {
@@ -216,7 +196,7 @@ void IssuesWidget::slotProgressInfo(const QString &folder, const ProgressInfo &p

 void IssuesWidget::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
 {
-    if (!item->showInIssuesTab())
+    if (!item->hasErrorStatus())
        return;
    QTreeWidgetItem *line = ProtocolWidget::createCompletedTreewidgetItem(folder, *item);
    if (!line)
--- a/src/gui/issueswidget.h
+++ b/src/gui/issueswidget.h
@@ -18,7 +18,6 @@
 #include <QDialog>
 #include <QDateTime>
 #include <QLocale>
-#include <QTimer>

 #include "progressdispatcher.h"
 #include "owncloudgui.h"
@@ -85,9 +84,6 @@ private:
    /// Wipes all insufficient remote storgage blacklist entries
    void retryInsufficentRemoteStorageErrors(const QString &folderAlias);

-    /// Each insert disables sorting, this timer reenables it
-    QTimer _reenableSorting;
-
    Ui::IssuesWidget *_ui;
 };
 }
--- a/src/gui/issueswidget.ui
+++ b/src/gui/issueswidget.ui
@@ -127,13 +127,6 @@
     </column>
    </widget>
   </item>
-   <item>
-    <widget class="QLabel" name="_tooManyIssuesWarning">
-     <property name="text">
-      <string>There were too many issues. Not all will be visible here.</string>
-     </property>
-    </widget>
-   </item>
   <item>
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -50,13 +50,18 @@ const char propertyAccountC[] = "oc_account";
 ownCloudGui::ownCloudGui(Application *parent)
    : QObject(parent)
    , _tray(0)
+    ,
 #if defined(Q_OS_MAC)
-    , _settingsDialog(new SettingsDialogMac(this))
+    _settingsDialog(new SettingsDialogMac(this))
+    ,
 #else
-    , _settingsDialog(new SettingsDialog(this))
+    _settingsDialog(new SettingsDialog(this))
+    ,
 #endif
-    , _logBrowser(0)
+    _logBrowser(0)
+    , _contextMenuVisibleOsx(false)
    , _recentActionsMenu(0)
+    , _qdbusmenuWorkaround(false)
    , _app(parent)
 {
    _tray = new Systray();
@@ -112,7 +117,7 @@ void ownCloudGui::slotOpenSettingsDialog()

 void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason)
 {
-    if (_workaroundFakeDoubleClick) {
+    if (_qdbusmenuWorkaround) {
        static QElapsedTimer last_click;
        if (last_click.isValid() && last_click.elapsed() < 200) {
            return;
@@ -376,19 +381,17 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men

 void ownCloudGui::slotContextMenuAboutToShow()
 {
-    _contextMenuVisibleManual = true;
+    // For some reason on OS X _contextMenu->isVisible returns always false
+    _contextMenuVisibleOsx = true;

    // Update icon in sys tray, as it might change depending on the context menu state
    slotComputeOverallSyncStatus();
-
-    if (!_workaroundNoAboutToShowUpdate) {
-        updateContextMenu();
-    }
 }

 void ownCloudGui::slotContextMenuAboutToHide()
 {
-    _contextMenuVisibleManual = false;
+    // For some reason on OS X _contextMenu->isVisible returns always false
+    _contextMenuVisibleOsx = false;

    // Update icon in sys tray, as it might change depending on the context menu state
    slotComputeOverallSyncStatus();
@@ -396,11 +399,11 @@ void ownCloudGui::slotContextMenuAboutToHide()

 bool ownCloudGui::contextMenuVisible() const
 {
-    // On some platforms isVisible doesn't work and always returns false,
-    // elsewhere aboutToHide is unreliable.
-    if (_workaroundManualVisibility)
-        return _contextMenuVisibleManual;
+#ifdef Q_OS_MAC
+    return _contextMenuVisibleOsx;
+#else
    return _contextMenu->isVisible();
+#endif
 }

 static bool minimalTrayMenu()
@@ -423,36 +426,12 @@ static bool updateWhileVisible()
    }
 }

-static QByteArray envForceQDBusTrayWorkaround()
+static QByteArray forceQDBusTrayWorkaround()
 {
    static QByteArray var = qgetenv("OWNCLOUD_FORCE_QDBUS_TRAY_WORKAROUND");
    return var;
 }

-static QByteArray envForceWorkaroundShowAndHideTray()
-{
-    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_SHOW_HIDE");
-    return var;
-}
-
-static QByteArray envForceWorkaroundNoAboutToShowUpdate()
-{
-    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_NO_ABOUT_TO_SHOW");
-    return var;
-}
-
-static QByteArray envForceWorkaroundFakeDoubleClick()
-{
-    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_FAKE_DOUBLE_CLICK");
-    return var;
-}
-
-static QByteArray envForceWorkaroundManualVisibility()
-{
-    static QByteArray var = qgetenv("OWNCLOUD_FORCE_TRAY_MANUAL_VISIBILITY");
-    return var;
-}
-
 void ownCloudGui::setupContextMenu()
 {
    if (_contextMenu) {
@@ -475,65 +454,51 @@ void ownCloudGui::setupContextMenu()
        return;
    }

-    auto applyEnvVariable = [](bool *sw, const QByteArray &value) {
-        if (value == "1")
-            *sw = true;
-        if (value == "0")
-            *sw = false;
-    };
-
-    // This is an old compound flag that people might still depend on
-    bool qdbusmenuWorkarounds = false;
-    applyEnvVariable(&qdbusmenuWorkarounds, envForceQDBusTrayWorkaround());
-    if (qdbusmenuWorkarounds) {
-        _workaroundFakeDoubleClick = true;
-        _workaroundNoAboutToShowUpdate = true;
-        _workaroundShowAndHideTray = true;
-    }
-
-#ifdef Q_OS_MAC
-    // https://bugreports.qt.io/browse/QTBUG-54633
-    _workaroundNoAboutToShowUpdate = true;
-    _workaroundManualVisibility = true;
-#endif
-
+// Enables workarounds for bugs introduced in Qt 5.5.0
+// In particular QTBUG-47863 #3672 (tray menu fails to update and
+// becomes unresponsive) and QTBUG-48068 #3722 (click signal is
+// emitted several times)
+// The Qt version check intentionally uses 5.0.0 (where platformMenu()
+// was introduced) instead of 5.5.0 to avoid issues where the Qt
+// version used to build is different from the one used at runtime.
+// If we build with 5.6.1 or newer, we can skip this because the
+// bugs should be fixed there.
 #ifdef Q_OS_LINUX
-    // For KDE sessions if the platform plugin is missing,
-    // neither aboutToShow() updates nor the isVisible() call
-    // work. At least aboutToHide is reliable.
-    // https://github.com/owncloud/client/issues/6545
-    static QByteArray xdgCurrentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
-    static QByteArray desktopSession = qgetenv("DESKTOP_SESSION");
-    bool isKde =
-        xdgCurrentDesktop.contains("KDE")
-        || desktopSession.contains("plasma")
-        || desktopSession.contains("kde");
-    QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu());
-    if (isKde && platformMenu && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
-        _workaroundManualVisibility = true;
-        _workaroundNoAboutToShowUpdate = true;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) && (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
+    if (qVersion() == QByteArray("5.5.0")) {
+        QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu());
+        if (platformMenu
+            && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) {
+            _qdbusmenuWorkaround = true;
+            qCWarning(lcApplication) << "Enabled QDBusPlatformMenu workaround";
+        }
    }
+#endif
 #endif

-    applyEnvVariable(&_workaroundNoAboutToShowUpdate, envForceWorkaroundNoAboutToShowUpdate());
-    applyEnvVariable(&_workaroundFakeDoubleClick, envForceWorkaroundFakeDoubleClick());
-    applyEnvVariable(&_workaroundShowAndHideTray, envForceWorkaroundShowAndHideTray());
-    applyEnvVariable(&_workaroundManualVisibility, envForceWorkaroundManualVisibility());
+    if (forceQDBusTrayWorkaround() == "1") {
+        _qdbusmenuWorkaround = true;
+    } else if (forceQDBusTrayWorkaround() == "0") {
+        _qdbusmenuWorkaround = false;
+    }

-    qCInfo(lcApplication) << "Tray menu workarounds:"
-                          << "noabouttoshow:" << _workaroundNoAboutToShowUpdate
-                          << "fakedoubleclick:" << _workaroundFakeDoubleClick
-                          << "showhide:" << _workaroundShowAndHideTray
-                          << "manualvisibility:" << _workaroundManualVisibility;
-
-
-    connect(&_delayedTrayUpdateTimer, &QTimer::timeout, this, &ownCloudGui::updateContextMenu);
-    _delayedTrayUpdateTimer.setInterval(2 * 1000);
-    _delayedTrayUpdateTimer.setSingleShot(true);
-
-    connect(_contextMenu.data(), SIGNAL(aboutToShow()), SLOT(slotContextMenuAboutToShow()));
-    // unfortunately aboutToHide is unreliable, it seems to work on OSX though
-    connect(_contextMenu.data(), SIGNAL(aboutToHide()), SLOT(slotContextMenuAboutToHide()));
+    // When the qdbusmenuWorkaround is necessary, we can't do on-demand updates
+    // because the workaround is to hide and show the tray icon.
+    if (_qdbusmenuWorkaround) {
+        connect(&_workaroundBatchTrayUpdate, &QTimer::timeout, this, &ownCloudGui::updateContextMenu);
+        _workaroundBatchTrayUpdate.setInterval(30 * 1000);
+        _workaroundBatchTrayUpdate.setSingleShot(true);
+    } else {
+// Update the context menu whenever we're about to show it
+// to the user.
+#ifdef Q_OS_MAC
+        // https://bugreports.qt.io/browse/QTBUG-54633
+        connect(_contextMenu.data(), SIGNAL(aboutToShow()), SLOT(slotContextMenuAboutToShow()));
+        connect(_contextMenu.data(), SIGNAL(aboutToHide()), SLOT(slotContextMenuAboutToHide()));
+#else
+        connect(_contextMenu.data(), &QMenu::aboutToShow, this, &ownCloudGui::updateContextMenu);
+#endif
+    }

    // Populate the context menu now.
    updateContextMenu();
@@ -545,21 +510,13 @@ void ownCloudGui::updateContextMenu()
        return;
    }

-    // If it's visible, we can't update live, and it won't be updated lazily: reschedule
-    if (contextMenuVisible() && !updateWhileVisible() && _workaroundNoAboutToShowUpdate) {
-        if (!_delayedTrayUpdateTimer.isActive()) {
-            _delayedTrayUpdateTimer.start();
-        }
-        return;
-    }
-
-    if (_workaroundShowAndHideTray) {
+    if (_qdbusmenuWorkaround) {
        // To make tray menu updates work with these bugs (see setupContextMenu)
        // we need to hide and show the tray icon. We don't want to do that
        // while it's visible!
        if (contextMenuVisible()) {
-            if (!_delayedTrayUpdateTimer.isActive()) {
-                _delayedTrayUpdateTimer.start();
+            if (!_workaroundBatchTrayUpdate.isActive()) {
+                _workaroundBatchTrayUpdate.start();
            }
            return;
        }
@@ -674,30 +631,35 @@ void ownCloudGui::updateContextMenu()
    }
    _contextMenu->addAction(_actionQuit);

-    if (_workaroundShowAndHideTray) {
+    if (_qdbusmenuWorkaround) {
        _tray->show();
    }
 }

 void ownCloudGui::updateContextMenuNeeded()
 {
-    // if it's visible and we can update live: update now
-    if (contextMenuVisible() && updateWhileVisible()) {
-        // Note: don't update while visible on OSX
-        // https://bugreports.qt.io/browse/QTBUG-54845
-        updateContextMenu();
-        return;
-    }
-
-    // if we can't lazily update: update later
-    if (_workaroundNoAboutToShowUpdate) {
-        // Note: don't update immediately even in the invisible case
-        // as that can lead to extremely frequent menu updates
-        if (!_delayedTrayUpdateTimer.isActive()) {
-            _delayedTrayUpdateTimer.start();
+    // For the workaround case updating while visible is impossible. Instead
+    // occasionally update the menu when it's invisible.
+    if (_qdbusmenuWorkaround) {
+        if (!_workaroundBatchTrayUpdate.isActive()) {
+            _workaroundBatchTrayUpdate.start();
        }
        return;
    }
+
+#ifdef Q_OS_MAC
+    // https://bugreports.qt.io/browse/QTBUG-54845
+    // We cannot update on demand or while visible -> update when invisible.
+    if (!contextMenuVisible()) {
+        updateContextMenu();
+    }
+#else
+    if (updateWhileVisible() && contextMenuVisible())
+        updateContextMenu();
+#endif
+
+    // If no update was done here, we might update it on-demand due to
+    // the aboutToShow() signal.
 }

 void ownCloudGui::slotShowTrayMessage(const QString &title, const QString &msg)
--- a/src/gui/owncloudgui.h
+++ b/src/gui/owncloudgui.h
@@ -119,19 +119,14 @@ private:
    // tray's menu
    QScopedPointer<QMenu> _contextMenu;

-    // Manually tracking whether the context menu is visible via aboutToShow
-    // and aboutToHide. Unfortunately aboutToHide isn't reliable everywhere
-    // so this only gets used with _workaroundManualVisibility (when the tray's
-    // isVisible() is unreliable)
-    bool _contextMenuVisibleManual = false;
+    // Manually tracking whether the context menu is visible, but only works
+    // on OSX because aboutToHide is not reliable everywhere.
+    bool _contextMenuVisibleOsx;

    QMenu *_recentActionsMenu;
    QVector<QMenu *> _accountMenus;
-    bool _workaroundShowAndHideTray = false;
-    bool _workaroundNoAboutToShowUpdate = false;
-    bool _workaroundFakeDoubleClick = false;
-    bool _workaroundManualVisibility = false;
-    QTimer _delayedTrayUpdateTimer;
+    bool _qdbusmenuWorkaround;
+    QTimer _workaroundBatchTrayUpdate;
    QMap<QString, QPointer<ShareDialog>> _shareDialogs;

    QAction *_actionLogin;
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -195,7 +195,7 @@ QTreeWidgetItem *ProtocolWidget::createCompletedTreewidgetItem(const QString &fo

 void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
 {
-    if (!item->showInProtocolTab())
+    if (item->hasErrorStatus())
        return;
    QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, *item);
    if (line) {
--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -101,7 +101,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
        // https://github.com/owncloud/notifications/blob/master/docs/ocs-endpoint-v1.md#deleting-a-notification-for-a-user
        ActivityLink al;
        al._label = tr("Dismiss");
-        al._link  = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + QString::number(a._id)).toString();
+        al._link  = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + json.value("notification_id").toString()).toString();
        al._verb  = "DELETE";
        al._isPrimary = false;
        a._links.append(al);
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -254,9 +254,6 @@ void SettingsDialog::accountAdded(AccountState *s)
    connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialog::slotAccountAvatarChanged);
    connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialog::slotAccountDisplayNameChanged);

-    // Refresh immediatly when getting online
-    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialog::slotRefreshActivityAccountStateSender);
-
    slotRefreshActivity(s);
 }

@@ -399,11 +396,6 @@ QAction *SettingsDialog::createColorAwareAction(const QString &iconPath, const Q
    return createActionWithIcon(coloredIcon, text, iconPath);
 }

-void SettingsDialog::slotRefreshActivityAccountStateSender()
-{
-    slotRefreshActivity(qobject_cast<AccountState*>(sender()));
-}
-
 void SettingsDialog::slotRefreshActivity(AccountState *accountState)
 {
    if (accountState) {
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -59,7 +59,6 @@ public slots:
    void showIssuesList(const QString &folderAlias);
    void slotSwitchPage(QAction *action);
    void slotRefreshActivity(AccountState *accountState);
-    void slotRefreshActivityAccountStateSender();
    void slotAccountAvatarChanged();
    void slotAccountDisplayNameChanged();

--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -21,7 +21,6 @@
 #include "generalsettings.h"
 #include "networksettings.h"
 #include "accountsettings.h"
-#include "accountstate.h"
 #include "creds/abstractcredentials.h"
 #include "configfile.h"
 #include "progressdispatcher.h"
@@ -122,7 +121,6 @@ SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)

    ConfigFile cfg;
    cfg.restoreGeometry(this);
-    _activitySettings->setNotificationRefreshInterval(cfg.notificationRefreshInterval());
 }

 void SettingsDialogMac::closeEvent(QCloseEvent *event)
@@ -162,9 +160,6 @@ void SettingsDialogMac::accountAdded(AccountState *s)
    connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialogMac::slotAccountAvatarChanged);
    connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialogMac::slotAccountDisplayNameChanged);

-    // Refresh immediatly when getting online
-    connect(s, &AccountState::isConnectedChanged, this, &SettingsDialogMac::slotRefreshActivityAccountStateSender);
-
    slotRefreshActivity(s);
 }

@@ -180,11 +175,6 @@ void SettingsDialogMac::accountRemoved(AccountState *s)
    _activitySettings->slotRemoveAccount(s);
 }

-void SettingsDialogMac::slotRefreshActivityAccountStateSender()
-{
-    slotRefreshActivity(qobject_cast<AccountState*>(sender()));
-}
-
 void SettingsDialogMac::slotRefreshActivity(AccountState *accountState)
 {
    if (accountState) {
--- a/src/gui/settingsdialogmac.h
+++ b/src/gui/settingsdialogmac.h
@@ -49,7 +49,6 @@ public slots:
    void showActivityPage();
    void showIssuesList(const QString &folderAlias);
    void slotRefreshActivity(AccountState *accountState);
-    void slotRefreshActivityAccountStateSender();

 private slots:
    void accountAdded(AccountState *);
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -58,9 +58,7 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
    //Is this a file or folder?
    QFileInfo fi(localPath);
    _isFile = fi.isFile();
-
-    // Note: the share name cannot be longer than 64 characters
-    _ui->nameLineEdit->setText(tr("Public link"));
+    _ui->nameLineEdit->setText(tr("%1 link").arg(fi.fileName()));

    // the following progress indicator widgets are added to layouts which makes them
    // automatically deleted once the dialog dies.
@@ -223,10 +221,11 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
        // Connect all shares signals to gui slots
        connect(share.data(), &Share::serverError, this, &ShareLinkWidget::slotServerError);
        connect(share.data(), &Share::shareDeleted, this, &ShareLinkWidget::slotDeleteShareFetched);
+        connect(share.data(), SIGNAL(expireDateSet()), SLOT(slotExpireSet()));
+        connect(share.data(), SIGNAL(publicUploadSet()), SLOT(slotPermissionsSet()));
+        connect(share.data(), SIGNAL(passwordSet()), SLOT(slotPasswordSet()));
+        connect(share.data(), SIGNAL(passwordSetError(int, QString)), SLOT(slotPasswordSetError(int, QString)));
        connect(share.data(), &Share::permissionsSet, this, &ShareLinkWidget::slotPermissionsSet);
-        connect(linkShare.data(), &LinkShare::expireDateSet, this, &ShareLinkWidget::slotExpireSet);
-        connect(linkShare.data(), &LinkShare::passwordSet, this, &ShareLinkWidget::slotPasswordSet);
-        connect(linkShare.data(), &LinkShare::passwordSetError, this, &ShareLinkWidget::slotPasswordSetError);

        // Build the table row
        auto row = table->rowCount();
--- a/src/gui/sharemanager.cpp
+++ b/src/gui/sharemanager.cpp
@@ -289,7 +289,7 @@ void ShareManager::slotLinkShareCreated(const QJsonDocument &reply)
 void ShareManager::createShare(const QString &path,
    const Share::ShareType shareType,
    const QString shareWith,
-    const Share::Permissions desiredPermissions)
+    const Share::Permissions permissions)
 {
    auto job = new OcsShareJob(_account);
    connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
@@ -305,18 +305,17 @@ void ShareManager::createShare(const QString &path,

            // Limit the permissions we request for a share to the ones the item
            // was shared with initially.
-            auto validPermissions = desiredPermissions;
-            if (validPermissions == SharePermissionDefault) {
-                validPermissions = existingPermissions;
-            }
-            if (existingPermissions != SharePermissionDefault) {
-                validPermissions &= existingPermissions;
+            auto perm = permissions;
+            if (permissions == SharePermissionDefault) {
+                perm = existingPermissions;
+            } else if (existingPermissions != SharePermissionDefault) {
+                perm &= existingPermissions;
            }

            OcsShareJob *job = new OcsShareJob(_account);
            connect(job, &OcsShareJob::shareJobFinished, this, &ShareManager::slotShareCreated);
            connect(job, &OcsJob::ocsError, this, &ShareManager::slotOcsError);
-            job->createShare(path, shareType, shareWith, validPermissions);
+            job->createShare(path, shareType, shareWith, permissions);
        });
    job->getSharedWithMe();
 }
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -183,10 +183,6 @@ SocketApi::SocketApi(QObject *parent)
        // Example for developer builds (with ad-hoc signing identity): "" "com.owncloud.desktopclient" ".socketApi"
        // Example for official signed packages: "9B5WD74GWJ." "com.owncloud.desktopclient" ".socketApi"
        socketPath = SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi";
-#ifdef Q_OS_MAC
-        // Tell Finder to use the Extension (checking it from System Preferences -> Extensions)
-        system("pluginkit -e use -i  " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
-#endif
    } else if (Utility::isLinux() || Utility::isBSD()) {
        QString runtimeDir;
        runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
@@ -224,11 +220,6 @@ SocketApi::~SocketApi()
    // All remaining sockets will be destroyed with _localServer, their parent
    ASSERT(_listeners.isEmpty() || _listeners.first().socket->parent() == &_localServer);
    _listeners.clear();
-
-#ifdef Q_OS_MAC
-    // Unload the extension (uncheck from System Preferences -> Extensions)
-    system("pluginkit -e ignore -i  " APPLICATION_REV_DOMAIN ".FinderSyncExt &");
-#endif
 }

 void SocketApi::slotNewConnection()
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -204,10 +204,6 @@ void SslButton::slotUpdateMenu()

    AccountPtr account = _accountState->account();

-    if (account->isHttp2Supported()) {
-        _menu->addAction("HTTP/2")->setEnabled(false);
-    }
-
    if (account->url().scheme() == QLatin1String("https")) {
        QString sslVersion = account->_sessionCipher.protocolString()
            + ", " + account->_sessionCipher.authenticationMethod()
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -92,11 +92,6 @@ OCUpdater::OCUpdater(const QUrl &url)
 {
 }

-void OCUpdater::setUpdateUrl(const QUrl &url)
-{
-    _updateUrl = url;
-}
-
 bool OCUpdater::performUpdate()
 {
    ConfigFile cfg;
@@ -184,81 +179,6 @@ void OCUpdater::setDownloadState(DownloadState state)
    }
 }

-#if defined(Q_OS_WIN)
-// Following functions are taken from https://github.com/qt/qtbase/blob/5.8/src/corelib/io/qprocess_win.cpp
-// to make use of this fix https://github.com/qt/qtbase/commit/bec2fc19fd18768b16925597871c77a61e716abd
-// for QTBUG-53833: Without this we get an ugly powershell window on update. In 2.5/master we use Qt 5.10
-// which obviously already has the fix.
-static QString qt_create_commandline(const QString &program, const QStringList &arguments)
-{
-    QString args;
-    if (!program.isEmpty()) {
-        QString programName = program;
-        if (!programName.startsWith(QLatin1Char('\"')) && !programName.endsWith(QLatin1Char('\"')) && programName.contains(QLatin1Char(' ')))
-            programName = QLatin1Char('\"') + programName + QLatin1Char('\"');
-        programName.replace(QLatin1Char('/'), QLatin1Char('\\'));
-
-        // add the prgram as the first arg ... it works better
-        args = programName + QLatin1Char(' ');
-    }
-
-    for (int i=0; i<arguments.size(); ++i) {
-        QString tmp = arguments.at(i);
-        // Quotes are escaped and their preceding backslashes are doubled.
-        tmp.replace(QRegExp(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\""));
-        if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) {
-            // The argument must not end with a \ since this would be interpreted
-            // as escaping the quote -- rather put the \ behind the quote: e.g.
-            // rather use "foo"\ than "foo\"
-            int i = tmp.length();
-            while (i > 0 && tmp.at(i - 1) == QLatin1Char('\\'))
-                --i;
-            tmp.insert(i, QLatin1Char('"'));
-            tmp.prepend(QLatin1Char('"'));
-        }
-        args += QLatin1Char(' ') + tmp;
-    }
-    return args;
-}
-
-bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDir = QString(), qint64 *pid = 0)
-{
-    // static const DWORD errorElevationRequired = 740;
-
-    QString args = qt_create_commandline(program, arguments);
-    bool success = false;
-    PROCESS_INFORMATION pinfo;
-
-    DWORD dwCreationFlags = (GetConsoleWindow() ? 0 : CREATE_NO_WINDOW);
-    dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
-    STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
-                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-                                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-                               };
-    success = CreateProcess(0, (wchar_t*)args.utf16(),
-                            0, 0, FALSE, dwCreationFlags, 0,
-                            workingDir.isEmpty() ? 0 : (wchar_t*)workingDir.utf16(),
-                            &startupInfo, &pinfo);
-
-    // if (success) {
-        CloseHandle(pinfo.hThread);
-        CloseHandle(pinfo.hProcess);
-        if (pid)
-            *pid = pinfo.dwProcessId;
-    // } else if (GetLastError() == errorElevationRequired) {
-    //     success = startDetachedUacPrompt(program, arguments, workingDir, pid);
-    // }
-
-    return success;
-}
-#else
-bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDir = QString(), qint64 *pid = 0)
-{
-    return QProcess::startDetached(program, arguments, workingDir, pid);
-}
-#endif
-
 void OCUpdater::slotStartInstaller()
 {
    ConfigFile cfg;
@@ -267,30 +187,8 @@ void OCUpdater::slotStartInstaller()
    settings.setValue(autoUpdateAttemptedC, true);
    settings.sync();
    qCInfo(lcUpdater) << "Running updater" << updateFile;
-
-    if(updateFile.endsWith(".exe")) {
-        QProcess::startDetached(updateFile, QStringList() << "/S"
-                                                          << "/launch");
-    } else if(updateFile.endsWith(".msi")) {
-        // When MSIs are installed without gui they cannot launch applications
-        // as they lack the user context. That is why we need to run the client
-        // manually here. We wrap the msiexec and client invocation in a powershell
-        // script because owncloud.exe will be shut down for installation.
-        // | Out-Null forces powershell to wait for msiexec to finish.
-        auto preparePathForPowershell = [](QString path) {
-            path.replace("'", "''");
-
-            return QDir::toNativeSeparators(path);
-        };
-
-        auto msiLogFile = cfg.configPath() + "msi.log";
-        QString command = QString("&{msiexec /norestart /passive /i '%1' /L*V '%2'| Out-Null ; &'%3'}")
-             .arg(preparePathForPowershell(updateFile))
-             .arg(preparePathForPowershell(msiLogFile))
-             .arg(preparePathForPowershell(QCoreApplication::applicationFilePath()));
-
-        startDetached("powershell.exe", QStringList{"-Command", command});
-    }
+    QProcess::startDetached(updateFile, QStringList() << "/S"
+                                                      << "/launch");
 }

 void OCUpdater::checkForUpdate()
@@ -400,7 +298,7 @@ void NSISUpdater::versionInfoArrived(const UpdateInfo &info)
            showDialog(info);
        }
        if (!url.isEmpty()) {
-            _targetFile = cfg.configPath() + url.mid(url.lastIndexOf('/')+1);
+            _targetFile = cfg.configPath() + url.mid(url.lastIndexOf('/'));
            if (QFile(_targetFile).exists()) {
                setDownloadState(DownloadComplete);
            } else {
--- a/src/gui/updater/ocupdater.h
+++ b/src/gui/updater/ocupdater.h
@@ -99,8 +99,6 @@ public:
        UpdateOnlyAvailableThroughSystem };
    explicit OCUpdater(const QUrl &url);

-    void setUpdateUrl(const QUrl &url);
-
    bool performUpdate();

    void checkForUpdate() Q_DECL_OVERRIDE;
--- a/src/gui/updater/sparkleupdater.h
+++ b/src/gui/updater/sparkleupdater.h
@@ -23,20 +23,15 @@ namespace OCC {

 class SparkleUpdater : public Updater
 {
-    Q_OBJECT
 public:
-    SparkleUpdater(const QUrl &appCastUrl);
+    SparkleUpdater(const QString &appCastUrl);
    ~SparkleUpdater();

-    void setUpdateUrl(const QUrl &url);
-
    // unused in this updater
    void checkForUpdate() Q_DECL_OVERRIDE;
    void backgroundCheckForUpdate() Q_DECL_OVERRIDE;
    bool handleStartup() Q_DECL_OVERRIDE { return false; }

-    QString statusString();
-
 private:
    class Private;
    Private *d;
--- a/src/gui/updater/sparkleupdater_mac.mm
+++ b/src/gui/updater/sparkleupdater_mac.mm
@@ -73,7 +73,7 @@ class SparkleUpdater::Private
 };

 // Delete ~/Library//Preferences/com.owncloud.desktopclient.plist to re-test
-SparkleUpdater::SparkleUpdater(const QUrl& appCastUrl)
+SparkleUpdater::SparkleUpdater(const QString& appCastUrl)
    : Updater()
 {
    d = new Private;
@@ -89,7 +89,9 @@ SparkleUpdater::SparkleUpdater(const QUrl& appCastUrl)
    [d->updater resetUpdateCycle];
    [d->updater retain];

-    setUpdateUrl(appCastUrl);
+    NSURL* url = [NSURL URLWithString:
+            [NSString stringWithUTF8String: appCastUrl.toUtf8().data()]];
+    [d->updater setFeedURL: url];

    // Sparkle 1.8 required
    NSString *userAgent = [NSString stringWithUTF8String: Utility::userAgentString().data()];
@@ -102,14 +104,7 @@ SparkleUpdater::~SparkleUpdater()
    delete d;
 }

-void SparkleUpdater::setUpdateUrl(const QUrl &url)
-{
-    NSURL* nsurl = [NSURL URLWithString:
-            [NSString stringWithUTF8String: url.toString().toUtf8().data()]];
-    [d->updater setFeedURL: nsurl];
-}

-// FIXME: Should be changed to not instanicate the SparkleUpdater at all in this case
 bool autoUpdaterAllowed()
 {
    // See https://github.com/owncloud/client/issues/2931
@@ -138,10 +133,4 @@ void SparkleUpdater::backgroundCheckForUpdate()
    }
 }

-QString SparkleUpdater::statusString()
-{
-    // FIXME Show the real state depending on the callbacks
-    return QString();
-}
-
 } // namespace OCC
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -22,7 +22,6 @@
 #include "theme.h"
 #include "common/utility.h"
 #include "version.h"
-#include "configfile.h"

 #include "config.h"

@@ -40,29 +39,6 @@ Updater *Updater::instance()
    return _instance;
 }

-QUrl Updater::updateUrl()
-{
-    QUrl updateBaseUrl(QString::fromLocal8Bit(qgetenv("OCC_UPDATE_URL")));
-    if (updateBaseUrl.isEmpty()) {
-        updateBaseUrl = QUrl(QLatin1String(APPLICATION_UPDATE_URL));
-    }
-    if (!updateBaseUrl.isValid() || updateBaseUrl.host() == ".") {
-        return QUrl();
-    }
-
-    auto url = addQueryParams(updateBaseUrl);
-
-#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
-    url.addQueryItem(QLatin1String("sparkle"), QLatin1String("true"));
-#endif
-
-#if defined(Q_OS_WIN)
-    url.addQueryItem(QLatin1String("msi"), QLatin1String("true"));
-#endif
-
-    return url;
-}
-
 QUrl Updater::addQueryParams(const QUrl &url)
 {
    QUrl paramUrl = url;
@@ -88,10 +64,13 @@ QUrl Updater::addQueryParams(const QUrl &url)

    QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
    paramUrl.addQueryItem(QLatin1String("versionsuffix"), suffix);
-
-    auto channel = ConfigFile().updateChannel();
-    if (channel != "stable") {
-        paramUrl.addQueryItem(QLatin1String("channel"), channel);
+    if (suffix.startsWith("nightly")
+            || suffix.startsWith("alpha")
+            || suffix.startsWith("rc")
+            || suffix.startsWith("beta")) {
+        paramUrl.addQueryItem(QLatin1String("channel"), "beta");
+        // FIXME: Provide a checkbox in UI to enable regular versions to switch
+        // to beta channel
    }

    return paramUrl;
@@ -118,18 +97,23 @@ QString Updater::getSystemInfo()
 // To test, cmake with -DAPPLICATION_UPDATE_URL="http://127.0.0.1:8080/test.rss"
 Updater *Updater::create()
 {
-    auto url = updateUrl();
-    if (url.isEmpty()) {
+    QUrl updateBaseUrl(QString::fromLocal8Bit(qgetenv("OCC_UPDATE_URL")));
+    if (updateBaseUrl.isEmpty()) {
+        updateBaseUrl = QUrl(QLatin1String(APPLICATION_UPDATE_URL));
+    }
+    if (!updateBaseUrl.isValid() || updateBaseUrl.host() == ".") {
        qCWarning(lcUpdater) << "Not a valid updater URL, will not do update check";
        return 0;
    }
+    updateBaseUrl = addQueryParams(updateBaseUrl);
 #if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
-    return new SparkleUpdater(url);
+    updateBaseUrl.addQueryItem(QLatin1String("sparkle"), QLatin1String("true"));
+    return new SparkleUpdater(updateBaseUrl.toString());
 #elif defined(Q_OS_WIN32)
    // the best we can do is notify about updates
-    return new NSISUpdater(url);
+    return new NSISUpdater(updateBaseUrl);
 #else
-    return new PassiveUpdateNotifier(url);
+    return new PassiveUpdateNotifier(QUrl(updateBaseUrl));
 #endif
 }

--- a/src/gui/updater/updater.h
+++ b/src/gui/updater/updater.h
@@ -36,7 +36,6 @@ public:
    };

    static Updater *instance();
-    static QUrl updateUrl();

    virtual void checkForUpdate() = 0;
    virtual void backgroundCheckForUpdate() = 0;
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -93,8 +93,9 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op,
    qInfo(lcAccessManager) << op << verb << newRequest.url().toString() << "has X-Request-ID" << requestId;
    newRequest.setRawHeader("X-Request-ID", requestId);

-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 4)
-    // only enable HTTP2 with Qt 5.9.4 because old Qt have too many bugs (e.g. QTBUG-64359 is fixed in >= Qt 5.9.4)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+    // only enable HTTP2 with Qt 5.9 because Qt 5.8.0 has too many bugs
+    // (only use one connection if the server does not support HTTP2)
    if (newRequest.url().scheme() == "https") { // Not for "http": QTBUG-61397
        newRequest.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
    }
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -218,7 +218,7 @@ public:
    /** Detects a specific bug in older server versions */
    bool rootEtagChangesNotOnlySubFolderEtags();

-    /** True when the server connection is using HTTP2  */
+    /** True when the server supports HTTP2  */
    bool isHttp2Supported() { return _http2Supported; }
    void setHttp2Supported(bool value) { _http2Supported = value; }

--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -18,7 +18,6 @@
 #include "theme.h"
 #include "common/utility.h"
 #include "common/asserts.h"
-#include "version.h"

 #include "creds/abstractcredentials.h"

@@ -53,7 +52,6 @@ static const char crashReporterC[] = "crashReporter";
 static const char optionalDesktopNoficationsC[] = "optionalDesktopNotifications";
 static const char skipUpdateCheckC[] = "skipUpdateCheck";
 static const char updateCheckIntervalC[] = "updateCheckInterval";
-static const char updateChannelC[] = "updateChannel";
 static const char geometryC[] = "geometry";
 static const char timeoutC[] = "timeout";
 static const char chunkSizeC[] = "chunkSize";
@@ -470,28 +468,6 @@ void ConfigFile::setSkipUpdateCheck(bool skip, const QString &connection)
    settings.sync();
 }

-QString ConfigFile::updateChannel() const
-{
-    QString defaultUpdateChannel = QStringLiteral("stable");
-    QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
-    if (suffix.startsWith("daily")
-        || suffix.startsWith("nightly")
-        || suffix.startsWith("alpha")
-        || suffix.startsWith("rc")
-        || suffix.startsWith("beta")) {
-        defaultUpdateChannel = QStringLiteral("beta");
-    }
-
-    QSettings settings(configFile(), QSettings::IniFormat);
-    return settings.value(QLatin1String(updateChannelC), defaultUpdateChannel).toString();
-}
-
-void ConfigFile::setUpdateChannel(const QString &channel)
-{
-    QSettings settings(configFile(), QSettings::IniFormat);
-    settings.setValue(QLatin1String(updateChannelC), channel);
-}
-
 int ConfigFile::maxLogLines() const
 {
    QSettings settings(configFile(), QSettings::IniFormat);
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -131,9 +131,6 @@ public:
    bool skipUpdateCheck(const QString &connection = QString()) const;
    void setSkipUpdateCheck(bool, const QString &);

-    QString updateChannel() const;
-    void setUpdateChannel(const QString &channel);
-
    void saveGeometryHeader(QHeaderView *header);
    void restoreGeometryHeader(QHeaderView *header);

--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -317,7 +317,6 @@ bool ConnectionValidator::setAndCheckServerVersion(const QString &version)

 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
    // Record that the server supports HTTP/2
-    // Actual decision if we should use HTTP/2 is done in AccessManager::createRequest
    if (auto job = qobject_cast<AbstractNetworkJob *>(sender())) {
        if (auto reply = job->reply()) {
            _account->setHttp2Supported(
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -117,7 +117,6 @@ HttpCredentials::HttpCredentials(const QString &user, const QString &password, c
    , _clientSslKey(key)
    , _clientSslCertificate(certificate)
    , _keychainMigration(false)
-    , _retryOnKeyChainError(false)
 {
 }

@@ -220,21 +219,6 @@ void HttpCredentials::deleteOldKeychainEntries()

 void HttpCredentials::slotReadClientCertPEMJobDone(QKeychain::Job *incoming)
 {
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-    Q_ASSERT(!incoming->insecureFallback()); // If insecureFallback is set, the next test would be pointless
-    if (_retryOnKeyChainError && (incoming->error() == QKeychain::NoBackendAvailable
-            || incoming->error() == QKeychain::OtherError)) {
-        // Could be that the backend was not yet available. Wait some extra seconds.
-        // (Issues #4274 and #6522)
-        // (For kwallet, the error is OtherError instead of NoBackendAvailable, maybe a bug in QtKeychain)
-        qCInfo(lcHttpCredentials) << "Backend unavailable (yet?) Retrying in a few seconds." << incoming->errorString();
-        QTimer::singleShot(10000, this, &HttpCredentials::fetchFromKeychainHelper);
-        _retryOnKeyChainError = false;
-        return;
-    }
-    _retryOnKeyChainError = false;
-#endif
-
    // Store PEM in memory
    ReadPasswordJob *readJob = static_cast<ReadPasswordJob *>(incoming);
    if (readJob->error() == NoError && readJob->binaryData().length() > 0) {
--- a/src/libsync/creds/httpcredentials.h
+++ b/src/libsync/creds/httpcredentials.h
@@ -141,7 +141,6 @@ protected:
    QSslKey _clientSslKey;
    QSslCertificate _clientSslCertificate;
    bool _keychainMigration;
-    bool _retryOnKeyChainError = true; // true if we haven't done yet any reading from keychain
 };


--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -219,7 +219,7 @@ void Logger::setLogFlush(bool flush)

 void Logger::setLogDebug(bool debug)
 {
-    QLoggingCategory::setFilterRules(debug ? QStringLiteral("sync.*.debug=true\ngui.*.debug=true") : QString());
+    QLoggingCategory::setFilterRules(debug ? QStringLiteral("qt.*=true\n*.debug=true") : QString());
    _logDebug = debug;
 }

--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -629,11 +629,7 @@ bool PropfindJob::finished()
 AvatarJob::AvatarJob(AccountPtr account, QObject *parent)
    : AbstractNetworkJob(account, QString(), parent)
 {
-    if (account->serverVersionInt() >= Account::makeServerVersion(10, 0, 0)) {
-        _avatarUrl = Utility::concatUrlPath(account->url(), QString("remote.php/dav/avatars/%1/128.png").arg(account->davUser()));
-    } else {
-        _avatarUrl = Utility::concatUrlPath(account->url(), QString("index.php/avatar/%1/128").arg(account->davUser()));
-    }
+    _avatarUrl = Utility::concatUrlPath(account->url(), QString("remote.php/dav/avatars/%1/128.png").arg(account->davUser()));
 }

 void AvatarJob::start()
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -579,7 +579,8 @@ bool OwncloudPropagator::localFileNameClash(const QString &relFile)
            re = false;
            qCWarning(lcPropagator) << "No valid fileinfo";
        } else {
-            // Need to normalize to composited form because of QTBUG-39622/QTBUG-55896
+            // Need to normalize to composited form because of
+            // https://bugreports.qt-project.org/browse/QTBUG-39622
            const QString cName = fileInfo.canonicalFilePath().normalized(QString::NormalizationForm_C);
            bool equal = (file == cName);
            re = (!equal && !cName.endsWith(relFile, Qt::CaseSensitive));
@@ -820,13 +821,10 @@ void PropagatorCompositeJob::slotSubJobFinished(SyncFileItem::Status status)
    ASSERT(i >= 0);
    _runningJobs.remove(i);

-    // Any sub job error will cause the whole composite to fail. This is important
-    // for knowing whether to update the etag in PropagateDirectory, for example.
    if (status == SyncFileItem::FatalError
        || status == SyncFileItem::NormalError
        || status == SyncFileItem::SoftError
-        || status == SyncFileItem::DetailError
-        || status == SyncFileItem::BlacklistedError) {
+        || status == SyncFileItem::DetailError) {
        _hasError = status;
    }

--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -210,9 +210,8 @@ public:

    virtual ~PropagatorCompositeJob()
    {
-        // Don't delete jobs in _jobsToDo and _runningJobs: they have parents
-        // that will be responsible for cleanup. Deleting them here would risk
-        // deleting something that has already been deleted by a shared parent.
+        qDeleteAll(_jobsToDo);
+        qDeleteAll(_runningJobs);
    }

    void appendJob(PropagatorJob *job)
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -553,16 +553,6 @@ void PropagateUploadFileCommon::commonErrorHandling(AbstractNetworkJob *job)
    abortWithError(status, errorString);
 }

-void PropagateUploadFileCommon::adjustLastJobTimeout(AbstractNetworkJob *job, quint64 fileSize)
-{
-    job->setTimeout(qBound(
-        job->timeoutMsec(),
-        // Calculate 3 minutes for each gigabyte of data
-        qint64((3 * 60 * 1000) * fileSize / 1e9),
-        // Maximum of 30 minutes
-        qint64(30 * 60 * 1000)));
-}
-
 void PropagateUploadFileCommon::slotJobDestroyed(QObject *job)
 {
    _jobs.erase(std::remove(_jobs.begin(), _jobs.end(), job), _jobs.end());
--- a/src/libsync/propagateupload.h
+++ b/src/libsync/propagateupload.h
@@ -281,17 +281,6 @@ protected:
     */
    void commonErrorHandling(AbstractNetworkJob *job);

-    /**
-     * Increases the timeout for the final MOVE/PUT for large files.
-     *
-     * This is an unfortunate workaround since the drawback is not being able to
-     * detect real disconnects in a timely manner. Shall go away when the server
-     * response starts coming quicker, or there is some sort of async api.
-     *
-     * See #6527, enterprise#2480
-     */
-    static void adjustLastJobTimeout(AbstractNetworkJob *job, quint64 fileSize);
-
    // Bases headers that need to be sent with every chunk
    QMap<QByteArray, QByteArray> headers();
 };
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -295,7 +295,6 @@ void PropagateUploadFileNG::startNextChunk()
        connect(job, &MoveJob::finishedSignal, this, &PropagateUploadFileNG::slotMoveJobFinished);
        connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
        propagator()->_activeJobList.append(this);
-        adjustLastJobTimeout(job, fileSize);
        job->start();
        return;
    }
--- a/src/libsync/propagateuploadv1.cpp
+++ b/src/libsync/propagateuploadv1.cpp
@@ -130,8 +130,6 @@ void PropagateUploadFileV1::startNextChunk()
    connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileV1::slotUploadProgress);
    connect(job, &PUTFileJob::uploadProgress, device, &UploadDevice::slotJobUploadProgress);
    connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
-    if (isFinalChunk)
-        adjustLastJobTimeout(job, fileSize);
    job->start();
    propagator()->_activeJobList.append(this);
    _currentChunk++;
@@ -303,7 +301,6 @@ void PropagateUploadFileV1::slotPutFinished()
        qCWarning(lcPropagateUpload) << "Server does not support X-OC-MTime" << job->reply()->rawHeader("X-OC-MTime");
        // Well, the mtime was not set
        done(SyncFileItem::SoftError, "Server does not support X-OC-MTime");
-        return;
    }

 #ifdef WITH_TESTING
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -66,7 +66,7 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
        bool ok;
        // The use of isSymLink here is okay:
        // we never want to go into this branch for .lnk files
-        bool isDir = fi.isDir() && !fi.isSymLink() && !FileSystem::isJunction(fi.absoluteFilePath());
+        bool isDir = fi.isDir() && !fi.isSymLink();
        if (isDir) {
            ok = removeRecursively(path + QLatin1Char('/') + di.fileName()); // recursive
        } else {
--- a/src/libsync/syncfileitem.h
+++ b/src/libsync/syncfileitem.h
@@ -82,9 +82,10 @@ public:
        /** For files whose errors were blacklisted
         *
         * If an file is blacklisted due to an error it isn't even reattempted. These
-         * errors should appear in the issues tab but should be silent otherwise.
+         * errors should appear in the issues tab, but not on the account settings and
+         * should not cause the sync run to fail.
         *
-         * A SoftError caused by blacklisting.
+         * A DetailError that doesn't cause sync failure.
         */
        BlacklistedError
    };
@@ -177,33 +178,20 @@ public:

    /**
     * True if the item had any kind of error.
+     *
+     * Used for deciding whether an item belongs to the protocol or the
+     * issues list on the activity page and for checking whether an
+     * item should be announced in the notification message.
     */
    bool hasErrorStatus() const
    {
        return _status == SyncFileItem::SoftError
            || _status == SyncFileItem::NormalError
            || _status == SyncFileItem::FatalError
+            || _status == SyncFileItem::Conflict
            || !_errorString.isEmpty();
    }

-    /**
-     * Whether this item should appear on the issues tab.
-     */
-    bool showInIssuesTab() const
-    {
-        return hasErrorStatus() || _status == SyncFileItem::Conflict;
-    }
-
-    /**
-     * Whether this item should appear on the protocol tab.
-     */
-    bool showInProtocolTab() const
-    {
-        return !showInIssuesTab()
-            // Don't show conflicts that were resolved as "not a conflict after all"
-            && !(_instruction == CSYNC_INSTRUCTION_CONFLICT && _status == SyncFileItem::Success);
-    }
-
    // Variables useful for everybody
    QString _file;
    QString _renameTarget;
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -127,7 +127,7 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl
    }

    QString key = name + "," + flavor;
-    QIcon &cached = _iconCache[key]; // Take reference, this will also "set" the cache entry
+    QIcon &cached = _iconCache[key];
    if (cached.isNull()) {
        if (QIcon::hasThemeIcon(name)) {
            // use from theme
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -172,14 +172,6 @@ private slots:
        fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
                                                                {"parentFolder/subFolderA/"});
        fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync(QByteArrayLiteral("parentFolder/subFolderA/"));
-        auto getEtag = [&](const QByteArray &file) {
-            SyncJournalFileRecord rec;
-            fakeFolder.syncJournal().getFileRecord(file, &rec);
-            return rec._etag;
-        };
-        QVERIFY(getEtag("parentFolder") == "_invalid_");
-        QVERIFY(getEtag("parentFolder/subFolderA") == "_invalid_");
-        QVERIFY(getEtag("parentFolder/subFolderA/subsubFolder") != "_invalid_");

        // But touch local file before the next sync, such that the local folder
        // can't be removed
@@ -594,58 +586,6 @@ private slots:
        QVERIFY(localFileExists("A/.hidden"));
        QVERIFY(fakeFolder.currentRemoteState().find("B/.hidden"));
    }
-
-    void testNoLocalEncoding()
-    {
-        auto utf8Locale = QTextCodec::codecForLocale();
-        if (utf8Locale->mibEnum() != 106) {
-            QSKIP("Test only works for UTF8 locale");
-        }
-
-        FakeFolder fakeFolder{ FileInfo::A12_B12_C12_S12() };
-        QVERIFY(fakeFolder.syncOnce());
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-
-        // Utf8 locale can sync both
-        fakeFolder.remoteModifier().insert("A/tößt");
-        fakeFolder.remoteModifier().insert("A/t𠜎t");
-        QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(fakeFolder.currentLocalState().find("A/tößt"));
-        QVERIFY(fakeFolder.currentLocalState().find("A/t𠜎t"));
-
-#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
-        // Try again with a locale that can represent ö but not 𠜎 (4-byte utf8).
-        QTextCodec::setCodecForLocale(QTextCodec::codecForName("ISO-8859-15"));
-        QVERIFY(QTextCodec::codecForLocale()->mibEnum() == 111);
-
-        fakeFolder.remoteModifier().insert("B/tößt");
-        fakeFolder.remoteModifier().insert("B/t𠜎t");
-        QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(fakeFolder.currentLocalState().find("B/tößt"));
-        QVERIFY(!fakeFolder.currentLocalState().find("B/t𠜎t"));
-        QVERIFY(!fakeFolder.currentLocalState().find("B/t?t"));
-        QVERIFY(!fakeFolder.currentLocalState().find("B/t??t"));
-        QVERIFY(!fakeFolder.currentLocalState().find("B/t???t"));
-        QVERIFY(!fakeFolder.currentLocalState().find("B/t????t"));
-        QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(fakeFolder.currentRemoteState().find("B/tößt"));
-        QVERIFY(fakeFolder.currentRemoteState().find("B/t𠜎t"));
-
-        // Try again with plain ascii
-        QTextCodec::setCodecForLocale(QTextCodec::codecForName("ASCII"));
-        QVERIFY(QTextCodec::codecForLocale()->mibEnum() == 3);
-
-        fakeFolder.remoteModifier().insert("C/tößt");
-        QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(!fakeFolder.currentLocalState().find("C/tößt"));
-        QVERIFY(!fakeFolder.currentLocalState().find("C/t??t"));
-        QVERIFY(!fakeFolder.currentLocalState().find("C/t????t"));
-        QVERIFY(fakeFolder.syncOnce());
-        QVERIFY(fakeFolder.currentRemoteState().find("C/tößt"));
-
-        QTextCodec::setCodecForLocale(utf8Locale);
-#endif
-    }
 };

 QTEST_GUILESS_MAIN(TestSyncEngine)
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -183,121 +183,6 @@ private slots:
        QCOMPARE(record.numericFileId(), QByteArray("123456789"));
    }

-    void testAvoidReadFromDbOnNextSync()
-    {
-        auto invalidEtag = QByteArray("_invalid_");
-        auto initialEtag = QByteArray("etag");
-        auto makeEntry = [&](const QByteArray &path, int type) {
-            SyncJournalFileRecord record;
-            record._path = path;
-            record._type = type;
-            record._etag = initialEtag;
-            _db.setFileRecord(record);
-        };
-        auto getEtag = [&](const QByteArray &path) {
-            SyncJournalFileRecord record;
-            _db.getFileRecord(path, &record);
-            return record._etag;
-        };
-
-        makeEntry("foodir", 2);
-        makeEntry("otherdir", 2);
-        makeEntry("foo%", 2); // wildcards don't apply
-        makeEntry("foodi_", 2); // wildcards don't apply
-        makeEntry("foodir/file", 0);
-        makeEntry("foodir/subdir", 2);
-        makeEntry("foodir/subdir/file", 0);
-        makeEntry("foodir/otherdir", 2);
-        makeEntry("fo", 2); // prefix, but does not match
-        makeEntry("foodir/sub", 2); // prefix, but does not match
-        makeEntry("foodir/subdir/subsubdir", 2);
-        makeEntry("foodir/subdir/subsubdir/file", 0);
-        makeEntry("foodir/subdir/otherdir", 2);
-
-        _db.avoidReadFromDbOnNextSync(QByteArray("foodir/subdir"));
-
-        // Direct effects of parent directories being set to _invalid_
-        QCOMPARE(getEtag("foodir"), invalidEtag);
-        QCOMPARE(getEtag("foodir/subdir"), invalidEtag);
-        QCOMPARE(getEtag("foodir/subdir/subsubdir"), initialEtag);
-
-        QCOMPARE(getEtag("foodir/file"), initialEtag);
-        QCOMPARE(getEtag("foodir/subdir/file"), initialEtag);
-        QCOMPARE(getEtag("foodir/subdir/subsubdir/file"), initialEtag);
-
-        QCOMPARE(getEtag("fo"), initialEtag);
-        QCOMPARE(getEtag("foo%"), initialEtag);
-        QCOMPARE(getEtag("foodi_"), initialEtag);
-        QCOMPARE(getEtag("otherdir"), initialEtag);
-        QCOMPARE(getEtag("foodir/otherdir"), initialEtag);
-        QCOMPARE(getEtag("foodir/sub"), initialEtag);
-        QCOMPARE(getEtag("foodir/subdir/otherdir"), initialEtag);
-
-        // Indirect effects: setFileRecord() calls filter etags
-        initialEtag = "etag2";
-
-        makeEntry("foodir", 2);
-        QCOMPARE(getEtag("foodir"), invalidEtag);
-        makeEntry("foodir/subdir", 2);
-        QCOMPARE(getEtag("foodir/subdir"), invalidEtag);
-        makeEntry("foodir/subdir/subsubdir", 2);
-        QCOMPARE(getEtag("foodir/subdir/subsubdir"), initialEtag);
-        makeEntry("fo", 2);
-        QCOMPARE(getEtag("fo"), initialEtag);
-        makeEntry("foodir/sub", 2);
-        QCOMPARE(getEtag("foodir/sub"), initialEtag);
-    }
-
-    void testRecursiveDelete()
-    {
-        auto makeEntry = [&](const QByteArray &path) {
-            SyncJournalFileRecord record;
-            record._path = path;
-            _db.setFileRecord(record);
-        };
-
-        QByteArrayList elements;
-        elements
-            << "foo"
-            << "foo/file"
-            << "bar"
-            << "moo"
-            << "moo/file"
-            << "foo%bar"
-            << "foo bla bar/file"
-            << "fo_"
-            << "fo_/file";
-        for (auto elem : elements)
-            makeEntry(elem);
-
-        auto checkElements = [&]() {
-            bool ok = true;
-            for (auto elem : elements) {
-                SyncJournalFileRecord record;
-                _db.getFileRecord(elem, &record);
-                if (!record.isValid()) {
-                    qWarning() << "Missing record: " << elem;
-                    ok = false;
-                }
-            }
-            return ok;
-        };
-
-        _db.deleteFileRecord("moo", true);
-        elements.removeAll("moo");
-        elements.removeAll("moo/file");
-        QVERIFY(checkElements());
-
-        _db.deleteFileRecord("fo_", true);
-        elements.removeAll("fo_");
-        elements.removeAll("fo_/file");
-        QVERIFY(checkElements());
-
-        _db.deleteFileRecord("foo%bar", true);
-        elements.removeAll("foo%bar");
-        QVERIFY(checkElements());
-    }
-
 private:
    SyncJournalDb _db;
 };
--- a/test/testsyncmove.cpp
+++ b/test/testsyncmove.cpp
@@ -576,51 +576,6 @@ private slots:
            //QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
        }
    }
-
-    // https://github.com/owncloud/client/issues/6629#issuecomment-402450691
-    // When a file is moved and the server mtime was not in sync, the local mtime should be kept
-    void testMoveAndMTimeChange()
-    {
-        FakeFolder fakeFolder{ FileInfo::A12_B12_C12_S12() };
-        int nPUT = 0;
-        int nDELETE = 0;
-        int nGET = 0;
-        int nMOVE = 0;
-        fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &req) {
-            if (op == QNetworkAccessManager::PutOperation)
-                ++nPUT;
-            if (op == QNetworkAccessManager::DeleteOperation)
-                ++nDELETE;
-            if (op == QNetworkAccessManager::GetOperation)
-                ++nGET;
-            if (req.attribute(QNetworkRequest::CustomVerbAttribute) == "MOVE")
-                ++nMOVE;
-            return nullptr;
-        });
-
-        // Changing the mtime on the server (without invalidating the etag)
-        fakeFolder.remoteModifier().find("A/a1")->lastModified = QDateTime::currentDateTimeUtc().addSecs(-50000);
-        fakeFolder.remoteModifier().find("A/a2")->lastModified = QDateTime::currentDateTimeUtc().addSecs(-40000);
-
-        // Move a few files
-        fakeFolder.remoteModifier().rename("A/a1", "A/a1_server_renamed");
-        fakeFolder.localModifier().rename("A/a2", "A/a2_local_renamed");
-
-        QVERIFY(fakeFolder.syncOnce());
-        QCOMPARE(nGET, 0);
-        QCOMPARE(nPUT, 0);
-        QCOMPARE(nMOVE, 1);
-        QCOMPARE(nDELETE, 0);
-
-        // Another sync should do nothing
-        QVERIFY(fakeFolder.syncOnce());
-        QCOMPARE(nGET, 0);
-        QCOMPARE(nPUT, 0);
-        QCOMPARE(nMOVE, 1);
-        QCOMPARE(nDELETE, 0);
-
-        QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
-    }
 };

 QTEST_GUILESS_MAIN(TestSyncMove)
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -373,7 +373,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="132"/>
        <source>Maintenance mode</source>
-        <translation>Mode de manteniment</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="134"/>
@@ -1408,47 +1408,42 @@ Els elements que poden ser eliminats s&apos;eliminaran si impedeixen que una car
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Carpeta</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="73"/>
        <source>Show warnings</source>
-        <translation>Mostra avisos</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>Mostra arxius descartats</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Fitxer</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2507,7 +2502,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/servernotificationhandler.cpp" line="103"/>
        <source>Dismiss</source>
-        <translation>Ignora</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2541,28 +2536,28 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Activitat</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>General</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Xarxa</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Compte</translation>
    </message>
@@ -2622,12 +2617,12 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="211"/>
        <source>Users and Groups</source>
-        <translation>Usuaris i Grups</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="218"/>
        <source>Public Links</source>
-        <translation>Enllaços públics</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2650,7 +2645,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="35"/>
        <source>Enter a name to create a new public link...</source>
-        <translation>Escriu un nom per crear un enllaç públic...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
@@ -2670,12 +2665,12 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="178"/>
        <source>Link properties:</source>
-        <translation>Propietats de l&apos;enllaç:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="220"/>
        <source>Show file listing</source>
-        <translation>Motra el llistat de fitxers</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="200"/>
@@ -2685,98 +2680,102 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="20"/>
        <source>Anyone with the link has access to the file/folder</source>
-        <translation>Qualsevol podrà accedir a l&apos;arxiu o carpeta amb aquest link</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Protegit amb contr&amp;asenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protegit amb contrasenya</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Esborra</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
-        <translation>Copiar al portadocuments</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Envia l&apos;enllaç per correu electrònic</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancel·lar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
-        <translation>Enllaç públic</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Establiu la contrasenya</translation>
    </message>
@@ -2811,7 +2810,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>Copiar al portadocuments</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -2826,7 +2825,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="337"/>
        <source>I shared something with you</source>
-        <translation>He compartit amb tu</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2919,7 +2918,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="557"/>
        <source>I shared something with you</source>
-        <translation>He compartit amb tu</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="565"/>
@@ -3850,7 +3849,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
        <source>Re-open Browser</source>
-        <translation>Reobrir navegador</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -4177,7 +4176,7 @@ No és aconsellada usar-la.</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>No es pot obrir el navegador</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -83,12 +83,12 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>Neznámá chyba: odpověď sítě byla smazána</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
        <source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
-        <translation>Odpověď serveru &quot;%1 %2&quot; do &quot;%3 %4&quot;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -388,7 +388,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="138"/>
        <source>Asking Credentials</source>
-        <translation>Požádat o pověření</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="140"/>
@@ -988,7 +988,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
        <source>There are unresolved conflicts. Click for details.</source>
-        <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@@ -1396,7 +1396,7 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>Seznam problémů</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1411,7 +1411,7 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Adresář</translation>
    </message>
@@ -1426,32 +1426,27 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
        <translation>Ukázat ignorované soubory</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopie</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Problém</translation>
    </message>
@@ -2544,28 +2539,28 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Aktivita</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Hlavní</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Síť</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Účet</translation>
    </message>
@@ -2691,95 +2686,99 @@ Nedoporučuje se jí používat.</translation>
        <translation>Kdokoliv, kdo má odkaz, může přistupovat k tomuto souboru/složce</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Ch&amp;ránit heslem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Chráněno heslem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Smazat</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Otevřít odkaz v prohlížeči</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Poslat odkaz emailem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Zrušit</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Veřejný odkaz</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Nastavte prosím heslo</translation>
    </message>
@@ -3628,12 +3627,12 @@ Nedoporučuje se jí používat.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="273"/>
        <location filename="../src/gui/owncloudgui.cpp" line="304"/>
        <source>Synchronization is paused</source>
-        <translation>Synchronizace je pozastavena</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="306"/>
        <source>Error during synchronization</source>
-        <translation>Chyba při synchronizaci</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="314"/>
@@ -3843,17 +3842,17 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
        <source>Please switch to your browser to proceed.</source>
-        <translation>Chcete-li pokračovat, přepněte prosím do svého prohlížeče.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
        <source>An error occured while connecting. Please try again.</source>
-        <translation>Při připojování došlo k chybě. Prosím zkuste to znovu.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
        <source>Re-open Browser</source>
-        <translation>Znovu otevřít prohlížeč</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -4180,7 +4179,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>Nemohu otevřít prohlížeč</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -506,7 +506,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="358"/>
        <source>You received new notifications from %1, %2 and other accounts.</source>
-        <translation>Sie haben %n neue Benachrichtigungen von %1, %2 und anderen Konten erhalten.</translation>
+        <translation>Sieh haben %n neue Benachrichtigungen von %1, %2 und anderen Konten erhalten.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="362"/>
@@ -995,7 +995,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
        <source>Checking for changes in &apos;%1&apos;</source>
-        <translation>Suche nach Änderungen in &apos;%1&apos;</translation>
+        <translation>Nach Änderungen suchen in &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="884"/>
@@ -1103,7 +1103,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="550"/>
        <source>Add Sync Connection</source>
-        <translation>Synchronisation hinzufügen</translation>
+        <translation>Ordner-Synchronisation hinzufügen</translation>
    </message>
 </context>
 <context>
@@ -1144,7 +1144,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="223"/>
        <source>Authentication failed accessing %1</source>
-        <translation>Die Authentifizierung ist beim Zugriff auf %1 fehlgeschlagen</translation>
+        <translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="225"/>
@@ -1233,7 +1233,7 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
    <message>
        <location filename="../src/gui/generalsettings.ui" line="171"/>
        <source>Ask for confirmation before synchronizing folders larger than</source>
-        <translation>Bestätigung erfragen, bevor Ordner synchronisiert werden die größer sind als:</translation>
+        <translation>Bestätigung erfragen, bevor Ordner synchronisiert werden. Grenze:</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="191"/>
@@ -1413,7 +1413,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Ordner</translation>
    </message>
@@ -1428,32 +1428,27 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
        <translation>Ignorierte Dateien anzeigen</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Es gab zu viele Probleme. Nicht alle können hier dargestellt werden.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Liste der Fehler in die Zwischenablage kopieren.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Zeit</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Datei</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Fehler</translation>
    </message>
@@ -2545,28 +2540,28 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Aktivität</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Allgemein</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Netzwerk</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Benutzerkonto</translation>
    </message>
@@ -2692,95 +2687,99 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Jeder mit dem Link hat Zugriff auf die Datei/Ordner</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Passwort geschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>passwortgeschützt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>%1 - Link</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>Das Teilen von Links wurde deaktiviert</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Öffentlichen Link zum Teilen erstellen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Löschen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Link im Browser öffnen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Link in Zwischenablage kopieren</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation>Link in die Zwischenablage kopieren (direkter download)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Link als E-Mail verschicken</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation>Link per Email senden (direkter download)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation>Löschung des öffentlichen Links bestätigen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Möchte Sie wirklich den öffentlichen Link &lt;i&gt;%1 &lt;/i&gt;löschen?&lt;p&gt;Hinweis: Dies kann nicht rückgängig gemacht werden.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Abbrechen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Öffentlicher Link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation>Öffentlichen Link löschen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Bitte wählen Sie ein Passwort:</translation>
    </message>
@@ -2800,7 +2799,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.ui" line="108"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You can direct people to this shared file or folder &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;by giving them a private link&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sie können Personen direkt zu dieser Freigabe leiten,&lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt; wenn Sie Ihnen diesen privaten Link &lt;/span&gt;&lt;/a&gt; geben.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sie können Leute direkt zu dieser Freigabe leiten&lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;, wenn Sie Ihnen einen privaten Link&lt;/span&gt;&lt;/a&gt;gibst.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="186"/>
@@ -3247,7 +3246,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1290"/>
        <source>Not allowed because you don&apos;t have permission to add parent folder</source>
-        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von übergeordneten Ordnern haben</translation>
+        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1297"/>
@@ -3327,12 +3326,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="450"/>
        <source>File names ending with a period are not supported on this file system.</source>
-        <translation>Dateinamen die mit einem Punkt enden sind in diesem Dateisystem nicht unterstützt.</translation>
+        <translation>Dateinamen enden mit einem Punkt, die in diesem Dateisystem nicht unterstützt wird.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="460"/>
        <source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
-        <translation>Dateinamen beinhalten das Zeichen &apos;%1&apos; diese werden in diesem Dateisystem nicht unterstützt.</translation>
+        <translation>Dateinamen beinhalten das Zeichen &apos;%1&apos; und diese werden in diesem Dateisystems nicht unterstützt.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="463"/>
@@ -3342,7 +3341,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="468"/>
        <source>Filename contains trailing spaces.</source>
-        <translation>Der Dateiname endet mit Leerzeichen.</translation>
+        <translation>Dateiname endet mit Leerzeichen.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="471"/>
@@ -3372,7 +3371,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="707"/>
        <source>Invalid characters, please rename &quot;%1&quot;</source>
-        <translation>Ungültige Zeichen, bitte benennen Sie &quot;%1&quot; um</translation>
+        <translation>Ungültige Zeichenm bitte benennen Sie &quot;%1&quot; um</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="827"/>
@@ -3603,12 +3602,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="240"/>
        <source>Disconnected from some accounts</source>
-        <translation>Die Verbindungen zu einigen Konnten wurde getrennt</translation>
+        <translation>Verbindungen zu einigen Konnten getrennt</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="251"/>
        <source>Disconnected from accounts:</source>
-        <translation>Verbindungen zu Konnten wurde getrennt:</translation>
+        <translation>Verbindungen zu Konnten getrennt:</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="253"/>
@@ -3844,7 +3843,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
        <source>Please switch to your browser to proceed.</source>
-        <translation>Bitte wechseln Sie zum Fortfahren in den Browser.</translation>
+        <translation>Bitte wechseln Sie zum Fortfahren in deinen Browser.</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1413,7 +1413,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Φάκελος</translation>
    </message>
@@ -1428,32 +1428,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Αντιγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Ώρα</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Αρχείο</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2546,28 +2541,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Δραστηριότητα</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Γενικά</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Δίκτυο</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Λογαριασμός</translation>
    </message>
@@ -2693,95 +2688,99 @@ It is not advisable to use it.</source>
        <translation>Οποιοσδήποτε με τη σύνδεση έχει πρόσβαση στο αρχείο / φάκελο</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Π&amp;ροστασία με κωδικό</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Προστατευμένο με κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>%1 σλυνδεσμος</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Διαγραφή</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Άνοιγμα συνδέσμου στον περιηγητή</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Αντιγραφή συνδέσμου στο πρόχειρο</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Αποστολή συνδέσμου με αλληλογραφία</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Ακύρωση</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Δημόσιος σύνδεσμος</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Ο δημόσιος &amp;διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Παρακαλούμε ορίστε Κωδικό</translation>
    </message>
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -1434,7 +1434,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1449,32 +1449,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2565,28 +2560,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2712,95 +2707,99 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -283,7 +283,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="788"/>
        <source>There are folders that were not synchronized because they are too big or external storages: </source>
-        <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o residen en almacenamiento externo:</translation>
+        <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o residen en almacenes externos:</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="834"/>
@@ -1244,7 +1244,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/gui/generalsettings.ui" line="215"/>
        <source>Ask for confirmation before synchronizing external storages</source>
-        <translation>Preguntar si se desea sincronizar carpetas de almacenamiento externo</translation>
+        <translation>Preguntar si se desea sincronizar carpetas de almacenes externos</translation>
    </message>
    <message>
        <location filename="../src/gui/generalsettings.ui" line="26"/>
@@ -1413,7 +1413,7 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Carpeta</translation>
    </message>
@@ -1428,32 +1428,27 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
        <translation>Mostrar archivos ignorados</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Hay demasiados problemas, No todos se visualizan aquí.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Copiar la lista de problemas al portapapeles.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Archivo</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Problema</translation>
    </message>
@@ -2545,28 +2540,28 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Actividad</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>General</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Red</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Cuenta</translation>
    </message>
@@ -2692,95 +2687,99 @@ No se recomienda usarla.</translation>
        <translation>Quienquiera que posea el vínculo tendrá acceso al archivo/carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Protegido por contr&amp;aseña </translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protegido con contraseña</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>%1 Enlace</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>Se ha deshabilitado la compartición de enlaces</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Crear un enlace público compartido</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Eliminar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Abrir enlace en el explorador</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Copiar enlace al portapapeles</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation>Copiar enlace al portapapeles (descarga directa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Enviar enlace por e-mail</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation>Enviar enlace por e-mail (descarga directa)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation>Confirmar eliminación de enlace de recurso compartido</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation>&lt;p&gt;¿Realmente desea borrar el enlace público compartido &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: Esta acción no se puede deshacer&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Enlace Publico</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation>Borrar el enlace compartido</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Por favor establece una contraseña</translation>
    </message>
@@ -3463,7 +3462,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/libsync/theme.cpp" line="315"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versión %1. Para obtener más información, visita &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Versión %1. Para obtener más información, visita&lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/libsync/theme.cpp" line="320"/>
@@ -3644,7 +3643,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
        <source>Unpause all folders</source>
-        <translation>Reanudar todas las carpetas</translation>
+        <translation>Despausar todas las carpetas</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@@ -3654,12 +3653,12 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
        <source>Unpause all synchronization</source>
-        <translation>Reanudar toda la sincronización</translation>
+        <translation>Despausar todas las sincronizaciones</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
        <source>Unpause synchronization</source>
-        <translation>Reanudar la sincronización</translation>
+        <translation>Despausar la sincronización</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
@@ -3783,7 +3782,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="327"/>
        <source>Ask for confirmation before synchronizing e&amp;xternal storages</source>
-        <translation>Preguntar si se desea sincronizar carpetas de almacenamiento e&amp;xterno</translation>
+        <translation>Preguntar si se desea sincronizar carpetas de almacenes e&amp;xternos</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="351"/>
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -60,12 +60,12 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="56"/>
        <source>Lorem ipsum dolor sit amet</source>
-        <translation>Lorem ipsum dolor sit amet</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="69"/>
        <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
-        <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -83,7 +83,7 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>Error desconocido: la respuesta de la red fue eliminada</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
@@ -1402,7 +1402,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Carpeta</translation>
    </message>
@@ -1417,32 +1417,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Archivo</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2533,28 +2528,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Actividad</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>General</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Red</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Cuenta</translation>
    </message>
@@ -2680,95 +2675,99 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Borrar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Mandar enlace por e-mail</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -1402,7 +1402,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Kaust</translation>
    </message>
@@ -1417,32 +1417,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopeeri</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Aeg</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Fail</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2534,28 +2529,28 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Toimingud</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Üldine</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Võrk</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Konto</translation>
    </message>
@@ -2648,7 +2643,7 @@ Selle kasutamine pole soovitatav.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
        <source>&amp;Create new</source>
-        <translation>&amp;Loo uus</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@@ -2681,95 +2676,99 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>P&amp;arooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Parooliga kaitstud</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Kustuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Saada link e-postiga</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Loobu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
-        <translation>Avalik link</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Palun määra parool</translation>
    </message>
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -1404,7 +1404,7 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Karpeta</translation>
    </message>
@@ -1419,32 +1419,27 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopiatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Noiz</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Fitxategia</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2536,28 +2531,28 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Jarduera</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Orokorra</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Sarea</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Kontua</translation>
    </message>
@@ -2683,95 +2678,99 @@ Ez da gomendagarria erabltzea.</translation>
        <translation>Esteka duen edonork atzitu dezake fitxategi/karpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Ezabatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Bidali lotura posta bidez</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Ezeztatu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Mesedez Ezarri Pasahitza</translation>
    </message>
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -83,7 +83,7 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>Tuntematon virhe: verkkovastaus poistettiin</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
@@ -243,7 +243,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="656"/>
        <source>Server %1 is currently in maintenance mode.</source>
-        <translation>Palvelin %1 on juuri nyt huoltotilassa.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="658"/>
@@ -373,7 +373,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="132"/>
        <source>Maintenance mode</source>
-        <translation>Huoltotila</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="134"/>
@@ -567,7 +567,7 @@
    <message>
        <location filename="../src/gui/application.cpp" line="168"/>
        <source>Quit ownCloud</source>
-        <translation>Lopeta ownCloud</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -747,15 +747,13 @@
        <location filename="../src/gui/folder.cpp" line="888"/>
        <source>A new folder larger than %1 MB has been added: %2.
 </source>
-        <translation>Uusi kansio, joka on  suurempi kuin %1 Mt, on lisätty: %2.
-</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="891"/>
        <source>A folder from an external storage has been added.
 </source>
-        <translation>Kansio erillisestä tallennustilasta on lisätty.
-</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="892"/>
@@ -983,7 +981,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
        <source>There are unresolved conflicts. Click for details.</source>
-        <translation>Selvittämättömiä ristiriitoja. Napsauta saadaksesi lisätietoja.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@@ -1391,7 +1389,7 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>Lista ongelmista</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1402,53 +1400,48 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
        <location filename="../src/gui/issueswidget.ui" line="42"/>
        <location filename="../src/gui/issueswidget.ui" line="61"/>
        <source>&lt;no filter&gt;</source>
-        <translation>&lt;no filter&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Kansio</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="73"/>
        <source>Show warnings</source>
-        <translation>Näytä varoitukset</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>Näytä ohitetut tiedostot</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Liian monta virhettä. Kaikki eivät ole näkyvissä tässä.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
-        <translation>Kopioi ongelmalista leikepöydälle.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopioi</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Aika</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Tiedosto</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
-        <translation>Ongelma</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1471,7 +1464,7 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="89"/>
        <source>&amp;Capture debug messages</source>
-        <translation>&amp;Kaappaa vianjäljitysviestit</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="101"/>
@@ -1688,7 +1681,7 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="112"/>
        <source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Palvelimelta palautettu virhe: &lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="115"/>
@@ -1708,7 +1701,7 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="125"/>
        <source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;Kirjautumisvirhe&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="131"/>
@@ -1880,7 +1873,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
        <source>Login in your browser</source>
-        <translation>Kirjaudu selaimeesi</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1958,7 +1951,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>Palvelin ilmoitti seuraavan virheen:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2538,28 +2531,28 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Toimet</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Yleiset</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Verkko</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Tili</translation>
    </message>
@@ -2647,12 +2640,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="35"/>
        <source>Enter a name to create a new public link...</source>
-        <translation>Anna nimi luodaksesi uuden julkisen linkin...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
        <source>&amp;Create new</source>
-        <translation>&amp;Luo uusi</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@@ -2667,7 +2660,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="178"/>
        <source>Link properties:</source>
-        <translation>Linkin ominaisuudet:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="220"/>
@@ -2682,98 +2675,102 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="20"/>
        <source>Anyone with the link has access to the file/folder</source>
-        <translation>Kenellä tahansa linkin omaavalla on pääsy tiedostoon/kansioon</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>&amp;Suojaa salasanalla</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Salasanasuojattu</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
-        <translation>Linkkijaot on poistettu käytöstä</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
-        <translation>Luo julkinen linkkijako</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
-        <source>Delete</source>
-        <translation>Poista</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
-        <source>Open link in browser</source>
-        <translation>Avaa linkki selaimessa</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
-        <source>Copy link to clipboard</source>
-        <translation>Kopioi linkki leikepöydälle</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
-        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
+        <source>Delete</source>
+        <translation>Poista</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
+        <source>Open link in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
+        <source>Copy link to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <source>Copy link to clipboard (direct download)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Lähetä linkki sähköpostitse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Peruuta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
-        <translation>Julkinen linkki</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
-        <translation>Poista linkkijako</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Aseta salasana</translation>
    </message>
@@ -2803,12 +2800,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
        <source>Open link in browser</source>
-        <translation>Avaa linkki selaimessa</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>Kopioi linkki leikepöydälle</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -2823,7 +2820,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="337"/>
        <source>I shared something with you</source>
-        <translation>Jaoin jotain kanssasi</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2916,22 +2913,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="557"/>
        <source>I shared something with you</source>
-        <translation>Jaoin jotain kanssasi</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="565"/>
        <source>Share...</source>
-        <translation>Jaa...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="567"/>
        <source>Copy private link to clipboard</source>
-        <translation>Kopioi yksityinen linkki leikepöydälle</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="568"/>
        <source>Send private link by email...</source>
-        <translation>Lähetä yksityinen linkki sähköpostitse...</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3255,7 +3252,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1607"/>
        <source>There is insufficient space available on the server for some uploads.</source>
-        <translation>Palvelimella ei ole riittävästi tallennustilaa joidenkin lähetysten osalta.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="167"/>
@@ -3350,7 +3347,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="489"/>
        <source>Unresolved conflict.</source>
-        <translation>Selvittämätön ristiriita.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="500"/>
@@ -3622,17 +3619,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="273"/>
        <location filename="../src/gui/owncloudgui.cpp" line="304"/>
        <source>Synchronization is paused</source>
-        <translation>Synkronointi on keskeytetty</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="306"/>
        <source>Error during synchronization</source>
-        <translation>Virhe synkronoinnin aikana</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="314"/>
        <source>No sync folders configured</source>
-        <translation>Synkronointikansioita ei ole määritetty</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
@@ -3837,17 +3834,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
        <source>Please switch to your browser to proceed.</source>
-        <translation>Siirry selaimeen jatkaaksesi.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
        <source>An error occured while connecting. Please try again.</source>
-        <translation>Yhdistäessä tapahtui virhe. Yritä uudelleen.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
        <source>Re-open Browser</source>
-        <translation>Avaa selain uudelleen</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3866,7 +3863,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/>
        <source>Ser&amp;ver Address</source>
-        <translation>&amp;Palvelinosoite</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/>
@@ -4174,7 +4171,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>Selainta ei voitu avata</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -14,7 +14,7 @@
    <message>
        <location filename="../src/gui/folderwizardsourcepage.ui" line="44"/>
        <source>&amp;Choose...</source>
-        <translation>&amp;Choisir...</translation>
+        <translation>&amp;Choisir</translation>
    </message>
 </context>
 <context>
@@ -769,7 +769,7 @@
 These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Tous les fichiers contenus dans le dossier synchronisé &apos;%1&apos; dossier ont été supprimés du serveur.
+        <translation>Tous les fichiers contenus dans le dossier synchronisé &apos;%1&apos; ont été supprimés du serveur.
 Ces suppressions seront synchronisées sur vos dossiers locaux synchronisés, rendant ces fichiers inaccessibles, à moins que vous n&apos;ayez le droit de les restaurer.
 Si vous décidez de conserver ces fichiers, ils seront synchronisés à nouveau avec le serveur si vous en avez le droit.
 Si vous décidez de supprimer ces fichiers, ils vous seront inaccessibles, sauf si vous en êtes le propriétaire.</translation>
@@ -1414,7 +1414,7 @@ L&apos;option &quot;Autoriser suppression&quot; permet de ne pas bloquer la supp
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Dossier</translation>
    </message>
@@ -1429,32 +1429,27 @@ L&apos;option &quot;Autoriser suppression&quot; permet de ne pas bloquer la supp
        <translation>Voir les fichiers ignorés</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>De trop nombreuses questions se posent. Toutes n&apos;apparaissent pas ici.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Copier la liste des anomalies dans le presse-papier.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copier</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Heure</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Fichier</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Incident</translation>
    </message>
@@ -1735,8 +1730,8 @@ L&apos;option &quot;Autoriser suppression&quot; permet de ne pas bloquer la supp
        <location filename="../src/gui/updater/ocupdater.cpp" line="104"/>
        <source>A new update for %1 is about to be installed. The updater may ask
 for additional privileges during the process.</source>
-        <translation>Une mise à jour de %1 est sur le point d&apos;être installée. 
-L&apos;assistant de mise à jour peut vous demandez des autorisations supplémentaires afin de procéder à l&apos;installation.</translation>
+        <translation>Une nouvelle mise à jour de %1 est sur le point d&apos;être installée. 
+L&apos;assistant peut demander des privilèges additionnels durant le processus.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
@@ -2547,28 +2542,28 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Activité</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Paramètres</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Réseau</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Compte</translation>
    </message>
@@ -2694,96 +2689,100 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Quiconque dispose du lien a accès aux fichiers/dossiers</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Protéger par mot de p&amp;asse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protégé par mot de passe</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>lien %1</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>Les partages par lien ont été désactivés</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Créer une lien de partage public</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Supprimer</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Ouvrir le lien dans le navigateur</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Copier le lien vers le presse-papier</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation>Copier le lien vers le presse-papier (téléchargement direct)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Envoyer le lien par email</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation>Envoyer le lien par courriel (téléchargement direct)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation>Confirmer la suppression du partage par lien</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Voulez-vous vraiment supprimer le partage par lien public&lt;i&gt;%1&lt;/i&gt;?
 &lt;p&gt;Note: Cette action ne peut être annulée.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Anuler</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Lien public</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation>Supprimer le partage par lien</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Veuillez choisir un mot de passe</translation>
    </message>
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1402,7 +1402,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Cartafol</translation>
    </message>
@@ -1417,32 +1417,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Hora</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Ficheiro</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2535,28 +2530,28 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Actividade</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Xeral</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Conta</translation>
    </message>
@@ -2682,95 +2677,99 @@ Recomendámoslle que non o use.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Contr&amp;asinal de protección</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protexido con contrasinal</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Eliminar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Enviar a ligazón por correo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Estabeleza o contrasinal</translation>
    </message>
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -83,12 +83,12 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>Errore sconosciuto: la risposta di rete è stata eliminata</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
        <source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
-        <translation>Il server ha risposto &quot;%1 %2&quot; a &quot;%3 %4&quot;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -253,12 +253,12 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="667"/>
        <source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
-        <translation>Ottenimento dell&apos;autorizzazione dal browser. &lt;a href=&apos;%1&apos;&gt;Clicca qui&lt;/a&gt; per riaprirle nel browser.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
        <source>Connecting to %1...</source>
-        <translation>Connessione con %1...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="674"/>
@@ -388,7 +388,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="138"/>
        <source>Asking Credentials</source>
-        <translation>Richiesta credenziali</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="140"/>
@@ -1409,7 +1409,7 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Cartella</translation>
    </message>
@@ -1424,32 +1424,27 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
        <translation>Mostra i file ignorati</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Ci sono stati troppi errori. Non saranno visibili tutti qui.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Copia la lista dei problemi negli appunti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copia</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Ora</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>File</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Problema</translation>
    </message>
@@ -1696,22 +1691,22 @@ Gli elementi per i quali è consentita l&apos;eliminazione, saranno eliminati se
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="115"/>
        <source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Si è verificato un errore accedendo al &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="118"/>
        <source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Impossibile gestire la risposta JSON dal server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="121"/>
        <source>The reply from the server did not contain all expected fields</source>
-        <translation>La risposta del server non contiene tutti i campi attesi</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="125"/>
        <source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;Errore di login&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="131"/>
@@ -1961,7 +1956,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>Il server riporta il seguente errore:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2123,7 +2118,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="459"/>
        <source>The download would reduce free local disk space below the limit</source>
-        <translation>Il download ridurrebbe lo spazio su disco al di sotto del limite</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="463"/>
@@ -2310,7 +2305,7 @@ Non è consigliabile utilizzarlo.</translation>
        <location filename="../src/libsync/propagateupload.cpp" line="186"/>
        <location filename="../src/libsync/propagateupload.cpp" line="549"/>
        <source>Upload of %1 exceeds the quota for the folder</source>
-        <translation>L&apos;upload eccede di %1 la quota della cartella</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="622"/>
@@ -2541,28 +2536,28 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Attività</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Generale</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Rete</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Account</translation>
    </message>
@@ -2655,7 +2650,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
        <source>&amp;Create new</source>
-        <translation>&amp;Crea nuovo</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@@ -2670,7 +2665,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="178"/>
        <source>Link properties:</source>
-        <translation>Proprietà di collegamento:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="220"/>
@@ -2688,95 +2683,99 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Chiunque sia in possesso del collegamento ha accesso al file/cartella</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Proteggi con p&amp;assword</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protetta da password</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>La condivisione tramite link è stata disabilitata</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Crea collegamento pubblico</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Elimina</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Apri collegamento nel browser</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Copia link negli appunti</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
-        <translation>Copia negli appunti (download diretto)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Invia collegamento tramite email</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
-        <translation>Invia link tramite email (download diretto)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Annulla</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Collegamento pubblico</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
-        <translation>Cancella link condiviso</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>imposta la password</translation>
    </message>
@@ -3222,7 +3221,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="477"/>
        <source>Folder hierarchy is too deep</source>
-        <translation>La gerarchia della cartella è troppo profonda</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="493"/>
@@ -3238,7 +3237,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="812"/>
        <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
-        <translation>Non posso aprire o creare il database locale di sincronizzazione. Assicurarsi di avere il i permessi di scrittura nella cartella di sincronizzazione</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1290"/>
@@ -3253,12 +3252,12 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1600"/>
        <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
-        <translation>Lo spazio su disco è scarso: I downloads che ridurranno lo spazio libero al di sotto di %1 verranno saltati.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1607"/>
        <source>There is insufficient space available on the server for some uploads.</source>
-        <translation>Non c&apos;è spazio disponibile sul server per effettuare caricamenti.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="167"/>
@@ -3348,12 +3347,12 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="480"/>
        <source>The filename cannot be encoded on your file system.</source>
-        <translation>Il nome del file non può essere codificato sul tuo file system.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="489"/>
        <source>Unresolved conflict.</source>
-        <translation>Conflitto irrisolto.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="500"/>
@@ -3840,7 +3839,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
        <source>Please switch to your browser to proceed.</source>
-        <translation>Prego ritorna al tuo browser per procedere.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
@@ -3850,7 +3849,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
        <source>Re-open Browser</source>
-        <translation>Ri-apri browser</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -4182,7 +4181,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
        <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
-        <translation>Si è verificato un errore all&apos;avvio del browser per accedere all&apos;URL% 1. Forse non è stato configurato nessun browser predefinito?</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="55"/>
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -83,12 +83,12 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>未知のエラーです：ネットワーク応答が削除されました</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
        <source>Server replied &quot;%1 %2&quot; to &quot;%3 %4&quot;</source>
-        <translation>サーバの返答は &quot;%1 %2&quot; から &quot;%3 %4&quot;です</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -253,7 +253,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="667"/>
        <source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
-        <translation>ブラウザから権限を取得しています。&lt;a href=&apos;%1&apos;&gt;ここをクリック&lt;/a&gt;してブラウザを再度開いてください。 </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
@@ -1396,7 +1396,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>問題一覧</translation>
+        <translation>課題一覧</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1411,49 +1411,44 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>フォルダー</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="73"/>
        <source>Show warnings</source>
-        <translation>警告を表示</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>除外ファイルを表示</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>問題が多すぎます。すべてはここに表示できません。</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
-        <translation>問題リストをクリップボードにコピーしてください。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>コピー</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>時刻</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>ファイル</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
-        <translation>問題</translation>
+        <translation>課題</translation>
    </message>
 </context>
 <context>
@@ -1693,7 +1688,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="112"/>
        <source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>サーバからエラーが返されました: &lt;em&gt;%1&lt;/em&gt; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="115"/>
@@ -1708,17 +1703,17 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="121"/>
        <source>The reply from the server did not contain all expected fields</source>
-        <translation>サーバからの返答にあるべきフィールドがありません</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="125"/>
        <source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;ログインエラー&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="131"/>
        <source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;ユーザの誤りです&lt;/h1&gt;&lt;p&gt;&lt;em&gt;%1&lt;/em&gt;としてログインされましたがｍ、&lt;em&gt;%2&lt;/em&gt;でなければいけません。&lt;br&gt;別のタブで %3 からログアウトし、&lt;a href=&apos;%4&apos;&gt;ここをクリック&lt;/a&gt;して %2 としてログインしてください&lt;/p&gt; </translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1885,7 +1880,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
        <source>Login in your browser</source>
-        <translation>御自身のブラウザでログインしてください</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1962,7 +1957,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>サーバが以下のエラーを報告しています:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2542,28 +2537,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>アクティビティ</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>一般</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>ネットワーク</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>アカウント</translation>
    </message>
@@ -2686,98 +2681,102 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="20"/>
        <source>Anyone with the link has access to the file/folder</source>
-        <translation>リンクを知っている人はファイル/フォルダーにアクセスできます</translation>
+        <translation>リンクを知っている人はファイル/フォルダにアクセスできます</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>パスワード保護(&amp;A)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>パスワード保護</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>削除</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
-        <translation>ブラウザでリンクを開く</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
-        <translation>クリップボードにリンクをコピー</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>メールでリンクを送信</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>キャンセル</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>共有するにはパスワードが必要(&amp;A)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>パスワードを入力してください</translation>
    </message>
@@ -2807,12 +2806,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
        <source>Open link in browser</source>
-        <translation>ブラウザでリンクを開く</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>クリップボードにリンクをコピー</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -4178,12 +4177,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>ブラウザを開くことができませんでした。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
        <source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
-        <translation>URL %1 をブラウザで開く際にエラーが発生しました。おそらくデフォルトのブラウザが設定されていないのでは？</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="55"/>
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -253,7 +253,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="667"/>
        <source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
-        <translation>Hente autorisasjon fra nettleseren. &lt;a href=&apos;%1&apos;&gt;Klikk her &lt;/a&gt; for å åpne nettleseren på nytt.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
@@ -388,7 +388,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="138"/>
        <source>Asking Credentials</source>
-        <translation>Be om legitimasjon</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="140"/>
@@ -989,7 +989,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
        <source>There are unresolved conflicts. Click for details.</source>
-        <translation>Det er uløste konflikter. Klikk for detaljer.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@@ -1397,8 +1397,7 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>Liste over problemer
-</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1413,49 +1412,44 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Mappe</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="73"/>
        <source>Show warnings</source>
-        <translation>Vis advarsler</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>Vis ignorerte filer</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Det var for mange problemer. Ikke alle vil være synlige her.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
-        <translation>Kopier problemlisten til utklippstavlen.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopier</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Tid</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Fil</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
-        <translation>Problem</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1478,7 +1472,7 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="89"/>
        <source>&amp;Capture debug messages</source>
-        <translation>Fang feilsøkingsmeldinger</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="101"/>
@@ -1695,32 +1689,32 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="112"/>
        <source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Feil returnert fra serveren: &lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="115"/>
        <source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Det oppsto en feil med tilgang til &quot;token&quot; endepunktet: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="118"/>
        <source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Kunne ikke prosessere JSON returnert fra serveren:&lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="121"/>
        <source>The reply from the server did not contain all expected fields</source>
-        <translation>Svaret fra serveren inneholder ikke alle forventede felt</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="125"/>
        <source>&lt;h1&gt;Login Error&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;Innloggingsfeil&lt;/h1&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="131"/>
        <source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;Feil bruker&lt;/h1&gt;&lt;p&gt;Du logget inn med bruker &lt;em&gt;%1&lt;/em&gt;, men må logge inn med bruker &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Logg ut av %3 i en annen tab, &lt;a href=&apos;%4&apos;&gt;klikk deretter her&lt;/a&gt; og logg inn som bruker %2&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1734,8 +1728,8 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
        <location filename="../src/gui/updater/ocupdater.cpp" line="104"/>
        <source>A new update for %1 is about to be installed. The updater may ask
 for additional privileges during the process.</source>
-        <translation>En ny oppdatering for %1 vil bli installert. Oppdateringen
-kan be om flere rettigheter underveis.</translation>
+        <translation>En ny oppdatering for %1 er i ferd med å bli installert. Oppdateringen
+kan be om flere rettigheter under behandlingen.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
@@ -1780,7 +1774,7 @@ kan be om flere rettigheter underveis.</translation>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="178"/>
        <source>Update Check</source>
-        <translation>Oppdateringssjekk</translation>
+        <translation>Oppdateringssjek</translation>
    </message>
 </context>
 <context>
@@ -1888,7 +1882,7 @@ kan be om flere rettigheter underveis.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
        <source>Login in your browser</source>
-        <translation>Logg inn i nettleseren din</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1966,7 +1960,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>Serveren rapporterte følgende feil:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2128,7 +2122,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="459"/>
        <source>The download would reduce free local disk space below the limit</source>
-        <translation>Nedlastingen ville ha redusert ledig lokal diskplass under grensen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="463"/>
@@ -2315,7 +2309,7 @@ Det er ikke tilrådelig å bruke den.</translation>
        <location filename="../src/libsync/propagateupload.cpp" line="186"/>
        <location filename="../src/libsync/propagateupload.cpp" line="549"/>
        <source>Upload of %1 exceeds the quota for the folder</source>
-        <translation>Opplasting av %1 overstiger kvoten for mappen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="622"/>
@@ -2546,28 +2540,28 @@ Det er ikke tilrådelig å bruke den.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Aktivitet</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Generelt</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Nettverk</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Konto</translation>
    </message>
@@ -2655,12 +2649,12 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="35"/>
        <source>Enter a name to create a new public link...</source>
-        <translation>Skriv inn et navn for å opprette en ny offentlig lenke...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
        <source>&amp;Create new</source>
-        <translation>&amp; Lag ny</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@@ -2675,7 +2669,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="178"/>
        <source>Link properties:</source>
-        <translation>Link egenskaper:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="220"/>
@@ -2693,95 +2687,99 @@ Det er ikke tilrådelig å bruke den.</translation>
        <translation>Alle med linken har tilgang til filen/mappen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>P&amp;assordbeskyttelse</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Passordbeskyttet</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
-        <translation>Lenker har blitt deaktivert</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
-        <translation>Opprett offentlig kobling deling</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Slett</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
-        <translation>Åpne lenke i nettleser</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
+        <source>Copy link to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <source>Copy link to clipboard (direct download)</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
-        <source>Copy link to clipboard</source>
-        <translation>Kopier link til utklippstavlen</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
-        <source>Copy link to clipboard (direct download)</source>
-        <translation>Kopier link til utklippstavlen (direkte nedlasting)</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
        <source>Send link by email</source>
        <translation>Send link i e-post</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
-        <translation>Send link i e-post (direkte nedlasting)</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
+        <source>Confirm Link Share Deletion</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
-        <source>Confirm Link Share Deletion</source>
-        <translation>Bekreft Sletting av Link</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ønsker du virkelig å slette delingen av den offentlige lenken&lt;i&gt;%1&lt;/i&gt;? &lt;/p&gt; &lt;p&gt;Merk: Denne handlingen kan ikke omgjøres.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Avbryt</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Offentlig lenke</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
-        <translation>Slett link</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Sett passord</translation>
    </message>
@@ -2801,22 +2799,22 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.ui" line="108"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You can direct people to this shared file or folder &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;by giving them a private link&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Du kan lede folk til denne delte filen eller mappen &lt;a href=&quot;private link menu&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt; ved å gi dem en privat lenke&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="186"/>
        <source>The item is not shared with any users or groups</source>
-        <translation>Elementet deles ikke med noen brukere eller grupper</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
        <source>Open link in browser</source>
-        <translation>Åpne lenke i nettleser</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>Kopier URL til utklippstavlen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -2831,7 +2829,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="337"/>
        <source>I shared something with you</source>
-        <translation>Jeg delte noe med deg</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2924,22 +2922,22 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="557"/>
        <source>I shared something with you</source>
-        <translation>Jeg delte noe med deg</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="565"/>
        <source>Share...</source>
-        <translation>Del...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="567"/>
        <source>Copy private link to clipboard</source>
-        <translation>Kopier privat URL til utklippstavlen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="568"/>
        <source>Send private link by email...</source>
-        <translation>Send privat link i e-post</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -3217,7 +3215,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="264"/>
        <source>%1 (skipped due to earlier error, trying again in %2)</source>
-        <translation>%1 (hoppet over på grunn av tidligere feil, prøver igjen om %2)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="474"/>
@@ -3227,12 +3225,12 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="477"/>
        <source>Folder hierarchy is too deep</source>
-        <translation>Mapphierarkiet er for dypt</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="493"/>
        <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
-        <translation>Konflikt: Serverversjon lastet ned, lokal kopi har byttet navn og er ikke lastet opp.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="777"/>
@@ -3243,7 +3241,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="812"/>
        <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
-        <translation>Kan ikke åpne eller opprette den lokale synkroniseringsdatabasen. Kontroller at du har skrivetilgang i synkroniseringsmappen.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1290"/>
@@ -3258,12 +3256,12 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1600"/>
        <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
-        <translation>Diskplass er lav: Nedlastinger som ville redusere ledig plass under% 1 ble hoppet over.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="1607"/>
        <source>There is insufficient space available on the server for some uploads.</source>
-        <translation>Det er ikke nok ledig plass på serveren for noen av opplastingene.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="167"/>
@@ -3353,7 +3351,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="480"/>
        <source>The filename cannot be encoded on your file system.</source>
-        <translation>Filnavnet kan ikke kodes på filsystemet ditt.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="489"/>
@@ -3604,7 +3602,7 @@ Det er ikke tilrådelig å bruke den.</translation>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="240"/>
        <source>Disconnected from some accounts</source>
-        <translation>Frakoblet noen kontoer</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="251"/>
@@ -3630,17 +3628,17 @@ Det er ikke tilrådelig å bruke den.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="273"/>
        <location filename="../src/gui/owncloudgui.cpp" line="304"/>
        <source>Synchronization is paused</source>
-        <translation>Synkronisering er satt på pause</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="306"/>
        <source>Error during synchronization</source>
-        <translation>Feil under synkronisering</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="314"/>
        <source>No sync folders configured</source>
-        <translation>Ingen synkronisering-mapper konfigurert.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -83,7 +83,7 @@
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="247"/>
        <source>Unknown error: network reply was deleted</source>
-        <translation>Onbekende fout: antwoord van het netwerk is verwijderd</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/abstractnetworkjob.cpp" line="390"/>
@@ -183,7 +183,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="316"/>
        <source>Remove folder sync connection</source>
-        <translation>Verwijder map-synchronisatie verbinding</translation>
+        <translation>Verwijderen map sync verbinding</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="387"/>
@@ -198,12 +198,12 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="438"/>
        <source>Confirm Folder Sync Connection Removal</source>
-        <translation>Bevestig verwijderen map-synchronisatie verbinding</translation>
+        <translation>Bevestig verwijderen Map Sync verbinding</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="445"/>
        <source>Remove Folder Sync Connection</source>
-        <translation>Verwijder map-synchronisatie verbinding</translation>
+        <translation>Verwijderen Map Sync verbinding</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="527"/>
@@ -243,7 +243,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="656"/>
        <source>Server %1 is currently in maintenance mode.</source>
-        <translation>Server %1 is momenteel in onderhoudsmodus.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="658"/>
@@ -253,7 +253,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="667"/>
        <source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
-        <translation>Probeert autorisatie te krijgen van de browser. 1 Klik hier 1 om de browser opnieuw te openen.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="671"/>
@@ -921,17 +921,17 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
    <message>
        <location filename="../src/gui/folderman.cpp" line="1344"/>
        <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Lokale map %1 bevat al een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation>
+        <translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1354"/>
        <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Lokale map %1 zit al in een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation>
+        <translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1362"/>
        <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een map-synchronisatie verbinding wordt gebruikt. Kies een andere!</translation>
+        <translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
    </message>
 </context>
 <context>
@@ -939,7 +939,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="46"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Voeg map synchronisatie verbinding toe</translation>
+        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
        <location filename="../src/gui/folderstatusdelegate.cpp" line="249"/>
@@ -990,7 +990,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="209"/>
        <source>There are unresolved conflicts. Click for details.</source>
-        <translation>Er zijn onopgeloste conflicten. Klik voor details.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
@@ -1000,7 +1000,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="884"/>
        <source>Reconciling changes</source>
-        <translation>Wijzigingen doorvoeren</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
@@ -1098,7 +1098,7 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="548"/>
        <source>Add Folder Sync Connection</source>
-        <translation>Voeg map-synchronisatie verbinding toe</translation>
+        <translation>Toevoegen mapsync verbinding</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="550"/>
@@ -1402,7 +1402,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>Lijst met problemen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1417,7 +1417,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Map</translation>
    </message>
@@ -1429,35 +1429,30 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>Tonen genegeerde bestanden</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Er zijn teveel problemen. Niet alles zal worden vertoond.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
-        <translation>Kopieer de probleemlijst naar het klembord.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopiëren</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Tijd</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Bestand</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Probleem</translation>
    </message>
@@ -1482,7 +1477,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="89"/>
        <source>&amp;Capture debug messages</source>
-        <translation>&amp;Capture berichten debuggen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="101"/>
@@ -1699,22 +1694,22 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="112"/>
        <source>Error returned from the server: &lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Fout gemeld door de server: &lt;em&gt;%1&lt;/em&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="115"/>
        <source>There was an error accessing the &apos;token&apos; endpoint: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Er heeft zich een fout voorgedaan bij het verkrijgen van de &apos;token&apos; eindpunt: 1 2 %1 2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="118"/>
        <source>Could not parse the JSON returned from the server: &lt;br&gt;&lt;em&gt;%1&lt;/em&gt;</source>
-        <translation>Kon de JSON dat teruggekomen is van de server niet ontleden: 1 2 %1 2</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="121"/>
        <source>The reply from the server did not contain all expected fields</source>
-        <translation>Het antwoord van de server bevat niet alle verwachte velden</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="125"/>
@@ -1724,7 +1719,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
    <message>
        <location filename="../src/gui/creds/oauth.cpp" line="131"/>
        <source>&lt;h1&gt;Wrong user&lt;/h1&gt;&lt;p&gt;You logged-in with user &lt;em&gt;%1&lt;/em&gt;, but must login with user &lt;em&gt;%2&lt;/em&gt;.&lt;br&gt;Please log out of %3 in another tab, then &lt;a href=&apos;%4&apos;&gt;click here&lt;/a&gt; and log in as user %2&lt;/p&gt;</source>
-        <translation>1 Verkeerde gebruiker 1 2 U bent ingelogd met user 3 %1 3, maar dient ingelogd te zijn met user 4 %2 4. 5  Log  %3 alstublieft uit in een andere tabblad, vervolgens 6 klikt u hier 6 en log-in als user %2 2</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1892,7 +1887,7 @@ vragen om extra autorisaties tijdens installatie.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
        <source>Login in your browser</source>
-        <translation>Login in uw browser</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1970,7 +1965,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>De server rapporteerde de volgende fout:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2132,7 +2127,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="459"/>
        <source>The download would reduce free local disk space below the limit</source>
-        <translation>De download zal de vrije lokale schijfruimte reduceren tot onder het limiet</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="463"/>
@@ -2319,7 +2314,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <location filename="../src/libsync/propagateupload.cpp" line="186"/>
        <location filename="../src/libsync/propagateupload.cpp" line="549"/>
        <source>Upload of %1 exceeds the quota for the folder</source>
-        <translation>Upload van %1 overtreft de quota van de folder</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/libsync/propagateupload.cpp" line="622"/>
@@ -2550,28 +2545,28 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Activiteit</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Algemeen</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Netwerk</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Account</translation>
    </message>
@@ -2659,12 +2654,12 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="35"/>
        <source>Enter a name to create a new public link...</source>
-        <translation>Voer een naam in om een nieuwe publieke link aan te maken</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="42"/>
        <source>&amp;Create new</source>
-        <translation>&amp;Create nieuw</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
@@ -2679,7 +2674,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="178"/>
        <source>Link properties:</source>
-        <translation>Link eigenschappen:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="220"/>
@@ -2697,95 +2692,99 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Iedereen met de link heeft toegang tot het bestand of de map</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>&amp;Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Wachtwoord beveiligd</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>%1 link</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
-        <translation>Link delen zijn uitgeschakeld</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
-        <translation>Maak een verdeelbare publieke link aan</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Verwijderen</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Openen link in browser</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
-        <translation>Kopiëren link naar klembord</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
-        <translation>Kopieer de link naar het klembord (directe download)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Versturen links via e-mail</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
-        <translation>Verzend link met email (directe download)</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
+        <source>Confirm Link Share Deletion</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
-        <source>Confirm Link Share Deletion</source>
-        <translation>Bevestig Gedeelde Link Verwijdering</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
-        <translation>1 Wilt u echt de verdeelbare publieke link verwijderen 2 %1 2 ? 1 3 Let op: deze actie kan niet ongedaan gemaakt worden. 3</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Annuleren</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Openbare Link</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
-        <translation>Verwijder verdeelbare link</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Stel uw wachtwoord in</translation>
    </message>
@@ -2820,7 +2819,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>Kopiëren link naar klembord</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -2938,7 +2937,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="567"/>
        <source>Copy private link to clipboard</source>
-        <translation>Kopiëren privé-link naar klembord</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="568"/>
@@ -4186,7 +4185,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="33"/>
        <source>Could not open browser</source>
-        <translation>Kon het browser niet openen</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/guiutility.cpp" line="34"/>
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -198,7 +198,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="438"/>
        <source>Confirm Folder Sync Connection Removal</source>
-        <translation>Potwierdź usunięcie połączenia folderów synchronizacji</translation>
+        <translation>Usuń folder połączenia synchronizacji</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="445"/>
@@ -1394,7 +1394,7 @@ Pozycje, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawn
    <message>
        <location filename="../src/gui/issueswidget.ui" line="20"/>
        <source>List of issues</source>
-        <translation>Lista zdarzeń</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="34"/>
@@ -1409,49 +1409,44 @@ Pozycje, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawn
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Folder</translation>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="73"/>
        <source>Show warnings</source>
-        <translation>Pokaż ostrzeżenia</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="83"/>
        <source>Show ignored files</source>
-        <translation>Pokaż ignorowane pliki</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Wystąpiło bardzo wiele zdarzeń. Nie wszystkie będą tu widoczne</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
-        <translation>Skopiuj listę zdarzeń do schowka</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopiuj</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Czas</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Plik</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
-        <translation>Zdarzenie</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1962,7 +1957,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>Serwer zgłosił następujący błąd:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2542,28 +2537,28 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Aktywność</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Ogólne</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Sieć</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Konto</translation>
    </message>
@@ -2689,95 +2684,99 @@ Niezalecane jest jego użycie.</translation>
        <translation>Każdy posiadający link ma dostęp do pliku/katalogu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Zabezpieczone hasłem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Usuń</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
-        <translation>Otwórz link w przeglądarce</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
+        <source>Copy link to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <source>Copy link to clipboard (direct download)</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
-        <source>Copy link to clipboard</source>
-        <translation>Skopuj link to schowka</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
-        <source>Copy link to clipboard (direct download)</source>
-        <translation>Skopiuj link do schowa (pobieranie bezpośrednie)</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
        <source>Send link by email</source>
        <translation>Wyślij link mailem</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
-        <translation>Wyślij link e-mailem (pobieranie bezpośrednie)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Anuluj</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
-        <translation>Link publiczny</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Proszę podać hasło</translation>
    </message>
@@ -2807,12 +2806,12 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
        <source>Open link in browser</source>
-        <translation>Otwórz link w przeglądarce</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
        <source>Copy link to clipboard</source>
-        <translation>Skopuj link to schowka</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
@@ -2930,12 +2929,12 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="567"/>
        <source>Copy private link to clipboard</source>
-        <translation>Kopiuj link prywatny do schowka</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="568"/>
        <source>Send private link by email...</source>
-        <translation>Wyślij link prywatny przez e-mail</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -1413,7 +1413,7 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Pasta</translation>
    </message>
@@ -1428,32 +1428,27 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a
        <translation>Mostrar ficheiros ignorados</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Copiar a lista de situações para a área de transferência</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Tempo</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Ficheiro</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Situação</translation>
    </message>
@@ -1966,7 +1961,7 @@ Não é aconselhada a sua utilização.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
        <source>The server reported the following error:</source>
-        <translation>O servidor retornou o seguinte erro:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="452"/>
@@ -2546,28 +2541,28 @@ Não é aconselhada a sua utilização.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Atividade</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Geral</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Conta</translation>
    </message>
@@ -2693,95 +2688,99 @@ Não é aconselhada a sua utilização.</translation>
        <translation>Qualquer pessoa com a hiperligação terá acesso ao ficheiro/pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Protegida por senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protegido com Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Eliminar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
-        <translation>Abrir ligação no navegador</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
-        <translation>Enviar hiperligação por correio eletrónico</translation>
+        <translation>Enviar hiperligação por e-mail</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Hiperligação Pública</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir Senha</translation>
    </message>
@@ -2811,7 +2810,7 @@ Não é aconselhada a sua utilização.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="235"/>
        <source>Open link in browser</source>
-        <translation>Abrir ligação no navegador</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="237"/>
@@ -2821,7 +2820,7 @@ Não é aconselhada a sua utilização.</translation>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="239"/>
        <source>Send link by email</source>
-        <translation>Enviar hiperligação por correio eletrónico</translation>
+        <translation>Enviar hiperligação por e-mail</translation>
    </message>
    <message>
        <location filename="../src/gui/shareusergroupwidget.cpp" line="249"/>
@@ -2939,7 +2938,7 @@ Não é aconselhada a sua utilização.</translation>
    <message>
        <location filename="../src/gui/socketapi.cpp" line="568"/>
        <source>Send private link by email...</source>
-        <translation>Enviar hiperligação privada por correio eletrónico...</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -1412,7 +1412,7 @@ Itens onde a eliminação é permitida serão excluídos se eles evitarem que um
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Pasta</translation>
    </message>
@@ -1427,32 +1427,27 @@ Itens onde a eliminação é permitida serão excluídos se eles evitarem que um
        <translation>Mostrar arquivos ignorados</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Havia muitos problemas. Nem todos serão visíveis aqui.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Copie a lista de problemas para a área de transferência.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Copiar</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Horário</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Arquivo</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Problemas</translation>
    </message>
@@ -2543,28 +2538,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Atividade</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Geral</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Rede</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Conta</translation>
    </message>
@@ -2690,95 +2685,99 @@ It is not advisable to use it.</source>
        <translation>Qualquer pessoa com o link tem acesso ao arquivo/pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>S&amp;enha de proteção</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Protegido por Senha</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>%1 linque</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>Os compartilhamentos de linque foram desativados</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Criar linque de compartilhamento público</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Excluir</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Abrir linque no navegador</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Copiar o linque para a área de transferência</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation>Copiar o linque para a área de transferência (download direto)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Enviar linque por e-mail</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation>Enviar linque por e-mail (download direto)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation>Confirmar o Link de Eliminação de Compartilhamento</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Você realmente deseja excluir o compartilhamento de links públicos &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Nota: Esta ação não pode ser desfeita.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Cancelar</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Linque público</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation>Excluir linque de compartilhamento</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Por favor, Definir senha</translation>
    </message>
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -1410,7 +1410,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Папка</translation>
    </message>
@@ -1425,32 +1425,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation>Показать игнорируемые файлы</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation>Было слишком много проблем. Не все будут видны здесь.</translation>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Скопировать список проблем в буфер обмена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Копировать</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Время</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Файл</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Проблема</translation>
    </message>
@@ -2543,28 +2538,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>События</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Основные</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Сеть</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Уч.запись</translation>
    </message>
@@ -2690,95 +2685,99 @@ It is not advisable to use it.</source>
        <translation>Каждый, у кого есть эта ссылка, имеет доступ к файлу/каталогу</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Защитить паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Защищено Паролем</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>Ссылка на %1</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation>Доступ по ссылкам был отключён</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation>Создать ссылку общего доступа</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Удалить</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Открыть ссылку в браузере</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Копировать ссылку в буфер обмена</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation>Скопировать ссылку в буфер обмена (прямое скачивание)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Отправить ссылку по email</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation>Отправить ссылку по почте (прямое скачивание)</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation>Подтвердите удаление доступа по ссылке</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Вы действтиельно хотите удалить доступ по общей ссылке &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Внимание: это действие будет невозможно отменить.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Отмена</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Общедоступная ссылка</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation>Удалить доступ по ссылке</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Публичные ссылки требуют пароля</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Пожалуйста, установите пароль</translation>
    </message>
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -1402,7 +1402,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Priečinok</translation>
    </message>
@@ -1417,32 +1417,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopírovať</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Súbor</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2535,28 +2530,28 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Aktivita</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Všeobecné</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Sieť</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Účet</translation>
    </message>
@@ -2682,95 +2677,99 @@ Nie je vhodné ju používať.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>Ch&amp;rániť heslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Chránené heslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Zmazať</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Odoslať odkaz emailom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Zrušiť</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <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="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Prosím nastavte si heslo</translation>
    </message>
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -1413,7 +1413,7 @@ Predmeti na mestu, kjer je brisanje dovoljeno, bodo izbisani, v kolikor zaradi n
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>Mapa</translation>
    </message>
@@ -1428,32 +1428,27 @@ Predmeti na mestu, kjer je brisanje dovoljeno, bodo izbisani, v kolikor zaradi n
        <translation>Pokaži prezrte datoteke</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation>Kopiraj seznam napak v odložišče.</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Kopiraj</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>Datoteka</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation>Napaka</translation>
    </message>
@@ -1888,7 +1883,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="44"/>
        <source>Login in your browser</source>
-        <translation>Prijava prek brskalnika</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2546,28 +2541,28 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Dejavnosti</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Splošno</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Omrežje</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Račun</translation>
    </message>
@@ -2693,95 +2688,99 @@ Uporaba ni priporočljiva.</translation>
        <translation>Vsak, ki ima povezavo ima dostop do datoteke ali mape</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>&amp;Zaščiti z geslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Zaščiteno z geslom</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
        <translation>Datoteke ni mogoče dodeliti v souporabo, ker je ni navedenih ustreznih dovoljenj.</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation>Povezava %1</translation>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Izbriši</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation>Odpri povezavo v brskalniku</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation>Kopiraj povezavo v odložišče</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Pošlji povezavo po elektronski pošti</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Prekliči</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation>Javna povezava</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Javna omogočanje &amp;souporabe zahteva geslo</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Določite geslo</translation>
    </message>
@@ -3630,17 +3629,17 @@ Uporaba ni priporočljiva.</translation>
        <location filename="../src/gui/owncloudgui.cpp" line="273"/>
        <location filename="../src/gui/owncloudgui.cpp" line="304"/>
        <source>Synchronization is paused</source>
-        <translation>Usklajevanje je v premoru</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="306"/>
        <source>Error during synchronization</source>
-        <translation>Med usklajevanjem je prišlo do napake</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="314"/>
        <source>No sync folders configured</source>
-        <translation>Ni nastavljenih map za usklajevanje.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -1402,7 +1402,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    </message>
    <message>
        <location filename="../src/gui/issueswidget.ui" line="50"/>
-        <location filename="../src/gui/issueswidget.cpp" line="83"/>
+        <location filename="../src/gui/issueswidget.cpp" line="77"/>
        <source>Folder</source>
        <translation>фасцикла</translation>
    </message>
@@ -1417,32 +1417,27 @@ Items where deletion is allowed will be deleted if they prevent a directory from
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="133"/>
-        <source>There were too many issues. Not all will be visible here.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/gui/issueswidget.ui" line="155"/>
+        <location filename="../src/gui/issueswidget.ui" line="148"/>
        <source>Copy the issues list to the clipboard.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.ui" line="158"/>
+        <location filename="../src/gui/issueswidget.ui" line="151"/>
        <source>Copy</source>
        <translation>Копирај</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="81"/>
+        <location filename="../src/gui/issueswidget.cpp" line="75"/>
        <source>Time</source>
        <translation>време</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="82"/>
+        <location filename="../src/gui/issueswidget.cpp" line="76"/>
        <source>File</source>
        <translation>фајл</translation>
    </message>
    <message>
-        <location filename="../src/gui/issueswidget.cpp" line="84"/>
+        <location filename="../src/gui/issueswidget.cpp" line="78"/>
        <source>Issue</source>
        <translation type="unfinished"/>
    </message>
@@ -2535,28 +2530,28 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::SettingsDialogMac</name>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="93"/>
        <source>%1</source>
        <translation>%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="97"/>
        <source>Activity</source>
        <translation>Активност</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="111"/>
        <source>General</source>
        <translation>Опште</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="116"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="115"/>
        <source>Network</source>
        <translation>Мрежа</translation>
    </message>
    <message>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="154"/>
-        <location filename="../src/gui/settingsdialogmac.cpp" line="221"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="152"/>
+        <location filename="../src/gui/settingsdialogmac.cpp" line="211"/>
        <source>Account</source>
        <translation>Налог</translation>
    </message>
@@ -2682,95 +2677,99 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="117"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="300"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="115"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="299"/>
        <source>P&amp;assword protect</source>
        <translation>&amp;Заштићено лозинком</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="412"/>
        <source>Password Protected</source>
        <translation>Заштићено лозинком</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
        <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="93"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="61"/>
+        <source>%1 link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="91"/>
        <source>Link shares have been disabled</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="107"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="105"/>
        <source>Create public link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="168"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="525"/>
        <source>Delete</source>
        <translation>Обриши</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="161"/>
        <source>Open link in browser</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="162"/>
        <source>Copy link to clipboard</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="163"/>
        <source>Copy link to clipboard (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="166"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
        <source>Send link by email</source>
        <translation>Пошаљи везу е-поштом</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="167"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="165"/>
        <source>Send link by email (direct download)</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="518"/>
        <source>Confirm Link Share Deletion</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="520"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="519"/>
        <source>&lt;p&gt;Do you really want to delete the public link share &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;Note: This action cannot be undone.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="527"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="526"/>
        <source>Cancel</source>
        <translation>Откажи</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="63"/>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="543"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="542"/>
        <source>Public link</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="253"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="252"/>
        <source>Delete link share</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="458"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="457"/>
        <source>Public sh&amp;aring requires a password</source>
        <translation>Јавно дељење з&amp;хтева лозинку</translation>
    </message>
    <message>
-        <location filename="../src/gui/sharelinkwidget.cpp" line="476"/>
+        <location filename="../src/gui/sharelinkwidget.cpp" line="475"/>
        <source>Please Set Password</source>
        <translation>Поставите лозинку</translation>
    </message>
--- a/Show More
+++ b/Show More