Merge branch 'master' into autocomplete-gui

87 files changed, 1402 insertions, 294 deletions

diff --git a/apps/files/composer/autoload.php b/apps/files/composer/autoload.php
new file mode 100644
index 00000000000..3aa13fa515d
--- /dev/null
+++ b/apps/files/composer/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitFiles::getLoader();
diff --git a/apps/files/composer/composer.json b/apps/files/composer/composer.json
new file mode 100644
index 00000000000..3412d9507b2
--- /dev/null
+++ b/apps/files/composer/composer.json
@@ -0,0 +1,13 @@
+{
+    "config" : {
+        "vendor-dir": ".",
+        "optimize-autoloader": true,
+        "authorative-autoloader": true,
+        "autoloader-suffix": "Files"
+    },
+    "autoload" : {
+        "psr-4": {
+            "OCA\\Files\\": "../lib/"
+        }
+    }
+}
diff --git a/apps/files/composer/composer/ClassLoader.php b/apps/files/composer/composer/ClassLoader.php
new file mode 100644
index 00000000000..2c72175e772
--- /dev/null
+++ b/apps/files/composer/composer/ClassLoader.php
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/apps/files/composer/composer/LICENSE b/apps/files/composer/composer/LICENSE
new file mode 100644
index 00000000000..f27399a042d
--- /dev/null
+++ b/apps/files/composer/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php
new file mode 100644
index 00000000000..d184702cfa2
--- /dev/null
+++ b/apps/files/composer/composer/autoload_classmap.php
@@ -0,0 +1,36 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
+    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
+    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
+    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
+    'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
+);
diff --git a/apps/files/composer/composer/autoload_namespaces.php b/apps/files/composer/composer/autoload_namespaces.php
new file mode 100644
index 00000000000..71c9e91858d
--- /dev/null
+++ b/apps/files/composer/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+);
diff --git a/apps/files/composer/composer/autoload_psr4.php b/apps/files/composer/composer/autoload_psr4.php
new file mode 100644
index 00000000000..c4f95a2b150
--- /dev/null
+++ b/apps/files/composer/composer/autoload_psr4.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\Files\\' => array($baseDir . '/../lib'),
+);
diff --git a/apps/files/composer/composer/autoload_real.php b/apps/files/composer/composer/autoload_real.php
new file mode 100644
index 00000000000..fe9ef0b02ae
--- /dev/null
+++ b/apps/files/composer/composer/autoload_real.php
@@ -0,0 +1,52 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitFiles
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitFiles', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitFiles', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitFiles::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php
new file mode 100644
index 00000000000..44094c6a34c
--- /dev/null
+++ b/apps/files/composer/composer/autoload_static.php
@@ -0,0 +1,62 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitFiles
+{
+    public static $prefixLengthsPsr4 = array (
+        'O' => 
+        array (
+            'OCA\\Files\\' => 10,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'OCA\\Files\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/../lib',
+        ),
+    );
+
+    public static $classMap = array (
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
+        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
+        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
+        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
+        'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitFiles::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 7c2d3b0bb1c..c03b1ce6fad 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -34,8 +34,6 @@
 .newFileMenu .error, #fileList .error {
 	color: $color-error;
 	border-color: $color-error;
-	-webkit-box-shadow: 0 0 6px #f8b9b7;
-	-moz-box-shadow: 0 0 6px #f8b9b7;
 	box-shadow: 0 0 6px #f8b9b7;
 }
 
@@ -232,9 +230,6 @@ table th#headerName {
 	position: relative;
 	height: 50px;
 }
-.has-favorites #headerName-container {
-	padding-left: 50px;
-}
 
 table th#headerSize, table td.filesize {
 	text-align: right;
@@ -296,7 +291,12 @@ table td.filename a.name {
 	line-height: 50px;
 	padding: 0;
 }
-table td.filename label.icon-loading-small {
+table td.filename .thumbnail-wrapper {
+	position: absolute;
+	width: 50px;
+	height: 50px;
+}
+table td.filename .thumbnail-wrapper.icon-loading-small {
 	&:after {
 		z-index: 10;
 	}
@@ -308,10 +308,10 @@ table td.filename .thumbnail {
 	display: inline-block;
 	width: 32px;
 	height: 32px;
+	background-size: 32px;
 	margin-left: 9px;
 	margin-top: 9px;
 	cursor: pointer;
-	float: left;
 	position: absolute;
 	z-index: 4;
 }
@@ -321,12 +321,9 @@ table td.filename input.filename {
 	margin-left: 48px;
 	cursor: text;
 }
-.has-favorites table td.filename input.filename {
-	margin-left: 52px;
-}
 
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
-table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:15px 0; }
+table td.filename .nametext, .modified, .column-last>span:first-child { float:left; padding:15px 0; }
 
 .modified, .column-last>span:first-child {
 	position: relative;
@@ -338,22 +335,23 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi
 /* TODO fix usability bug (accidental file/folder selection) */
 table td.filename .nametext {
 	position: absolute;
-	left: 55px;
 	padding: 0;
+	padding-left: 55px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	width: 70%;
 	max-width: 800px;
 	height: 100%;
+	z-index: 10;
+}
+table td.filename .uploadtext {
+	position: absolute;
+	left: 55px;
 }
 /* ellipsis on file names */
 table td.filename .nametext .innernametext {
 	max-width: calc(100% - 100px) !important;
 }
-.has-favorites #fileList td.filename a.name {
-	left: 50px;
-	margin-right: 50px;
-}
 
 .hide-hidden-files #fileList tr.hidden-file,
 .hide-hidden-files #fileList tr.hidden-file.dragging {
@@ -439,49 +437,27 @@ table td.filename .uploadtext {
 	opacity: .5;
 }
 
+table td.selection {
+	padding: 0;
+}
+
 /* File checkboxes */
-#fileList tr td.filename>.selectCheckBox + label:before {
-	opacity: 0;
-	position: absolute;
-	bottom: 4px;
-	right: 0;
-	z-index: 10;
+#fileList tr td.selection>.selectCheckBox + label:before {
+	opacity: 0.3;
 }
 
-/* Show checkbox when hovering, checked, or selected */
-#fileList tr:hover td.filename>.selectCheckBox + label:before,
-#fileList tr:focus td.filename>.selectCheckBox + label:before,
-#fileList tr td.filename>.selectCheckBox:checked + label:before,
-#fileList tr.selected td.filename>.selectCheckBox + label:before {
+/* Show checkbox with full opacity when hovering, checked, or selected */
+#fileList tr:hover td.selection>.selectCheckBox + label:before,
+#fileList tr:focus td.selection>.selectCheckBox + label:before,
+#fileList tr td.selection>.selectCheckBox:checked + label:before,
+#fileList tr.selected td.selection>.selectCheckBox + label:before {
 	opacity: 1;
 }
 
 /* Use label to have bigger clickable size for checkbox */
-#fileList tr td.filename>.selectCheckBox + label,
+#fileList tr td.selection>.selectCheckBox + label,
 .select-all + label {
-	background-position: 30px 30px;
-	height: 50px;
-	position: absolute;
-	width: 50px;
-	z-index: 5;
-}
-#fileList tr td.filename>.selectCheckBox {
-	/* sometimes checkbox height is bigger (KDE/Qt), so setting to absolute
-	 * to prevent it to increase the height */
-	position: absolute;
-	z-index: 10;
-}
-.select-all + label {
-	top: 0;
-}
-.select-all + label:before {
-	position: absolute;
-	top: 18px;
-	left: 18px;
-	z-index: 10;
-}
-.has-favorites .select-all {
-	left: 68px;
+	padding: 16px;
 }
 
 #fileList tr td.filename {
@@ -502,10 +478,11 @@ table td.filename .uploadtext {
 	display: inline-block;
 	float: left;
 }
-#fileList tr td.filename .action-favorite {
+#fileList tr td.filename .favorite-mark {
+	position: absolute;
 	display: block;
-	float: left;
-	width: 30px;
+	top: -6px;
+	right: -6px;
 	line-height: 100%;
 	text-align: center;
 }
@@ -617,7 +594,7 @@ a.action > img {
 	padding-left: 6px;
 }
 
-#fileList .action.action-favorite.permanent {
+#fileList .favorite-mark.permanent {
 	opacity: 1;
 }
 
@@ -661,9 +638,6 @@ table tr.summary td {
 .summary .info {
 	margin-left: 40px;
 }
-.has-favorites .summary .info {
-	margin-left: 90px;
-}
 
 table.dragshadow {
 	width:auto;
@@ -716,12 +690,24 @@ table.dragshadow td.size {
 
 #filestable .filename .action .icon,
 #filestable .selectedActions a .icon,
+#filestable .filename .favorite-mark .icon,
 #controls .actions .button .icon {
 	display: inline-block;
 	vertical-align: middle;
 	background-size: 16px 16px;
 }
 
+#filestable .filename .favorite-mark {
+	// Override default icons to always hide the star icon and always show the
+	// starred icon even when hovered or focused.
+	& .icon-star {
+		background-image: none;
+	}
+	& .icon-starred {
+		background-image: url('../../../core/img/actions/starred.svg?v=1');
+	}
+}
+
 #filestable .filename .action .icon.hidden,
 #filestable .selectedActions a .icon.hidden,
 #controls .actions .button .icon.hidden {
diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss
index eefc92c816b..e7b75910fa9 100644
--- a/apps/files/css/mobile.scss
+++ b/apps/files/css/mobile.scss
@@ -24,10 +24,6 @@ table td.date {
 table td {
 	padding: 0;
 }
-/* and accordingly fix left margin of file list summary on mobile */
-.summary .info {
-	margin-left: 105px;
-}
 
 /* remove shift for multiselect bar to account for missing navigation */
 table.multiselect thead {
diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 4685b20d43a..5263a4b0e03 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -1,6 +1,4 @@
 #upload {
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 	height: 36px;
 	width: 39px;
@@ -26,8 +24,6 @@
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
 
 #uploadprogresswrapper, #uploadprogresswrapper * {
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 3da9b06b0d3..0f320c8b3c7 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -706,7 +706,7 @@
 	 * @property {String} mime mime type
 	 * @property {int} permissions permissions
 	 * @property {(Function|String)} icon icon path to the icon or function that returns it (deprecated, use iconClass instead)
-	 * @property {(Function|String)} iconClass class name of the icon (recommended for theming)
+	 * @property {(String|OCA.Files.FileActions~iconClassFunction)} iconClass class name of the icon (recommended for theming)
 	 * @property {OCA.Files.FileActions~renderActionFunction} [render] optional rendering function
 	 * @property {OCA.Files.FileActions~actionHandler} actionHandler action handler function
 	 */
@@ -746,6 +746,17 @@
 	 */
 
 	/**
+	 * Icon class function for actions.
+	 * The function returns the icon class of the action using
+	 * the given context information.
+	 *
+	 * @callback OCA.Files.FileActions~iconClassFunction
+	 * @param {String} fileName name of the file on which the action must be performed
+	 * @param {OCA.Files.FileActionContext} context action context
+	 * @return {String} icon class
+	 */
+
+	/**
 	 * Action handler function for file actions
 	 *
 	 * @callback OCA.Files.FileActions~actionHandler
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 45d2bd83049..b8022f13734 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -115,6 +115,11 @@
 					item = _.extend({}, item);
 					item.displayName = item.displayName(self._context);
 				}
+				if (_.isFunction(item.iconClass)) {
+					var fileName = self._context.$file.attr('data-file');
+					item = _.extend({}, item);
+					item.iconClass = item.iconClass(fileName, self._context);
+				}
 				return item;
 			});
 			items = items.sort(function(actionA, actionB) {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc23ac73979..4790afcf4d0 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -332,7 +332,7 @@
 
 			this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this));
 
-			this.$fileList.on('change', 'td.filename>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
+			this.$fileList.on('change', 'td.selection>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
 			this.$el.on('show', _.bind(this._onShow, this));
 			this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
 			this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this));
@@ -593,7 +593,7 @@
 		 * @param {bool} state true to select, false to deselect
 		 */
 		_selectFileEl: function($tr, state, showDetailsView) {
-			var $checkbox = $tr.find('td.filename>.selectCheckBox');
+			var $checkbox = $tr.find('td.selection>.selectCheckBox');
 			var oldData = !!this._selectedFiles[$tr.data('id')];
 			var data;
 			$checkbox.prop('checked', state);
@@ -649,7 +649,7 @@
 				else {
 					this._lastChecked = $tr;
 				}
-				var $checkbox = $tr.find('td.filename>.selectCheckBox');
+				var $checkbox = $tr.find('td.selection>.selectCheckBox');
 				this._selectFileEl($tr, !$checkbox.prop('checked'));
 				this.updateSelectionSummary();
 			} else {
@@ -704,7 +704,7 @@
 		 */
 		_onClickSelectAll: function(e) {
 			var checked = $(e.target).prop('checked');
-			this.$fileList.find('td.filename>.selectCheckBox').prop('checked', checked)
+			this.$fileList.find('td.selection>.selectCheckBox').prop('checked', checked)
 				.closest('tr').toggleClass('selected', checked);
 			this._selectedFiles = {};
 			this._selectionSummary.clear();
@@ -1063,6 +1063,13 @@
 
 			this.$fileList.empty();
 
+			if (this._allowSelection) {
+				// The results table, which has no selection column, checks
+				// whether the main table has a selection column or not in order
+				// to align its contents with those of the main table.
+				this.$el.addClass('has-selection');
+			}
+
 			// clear "Select all" checkbox
 			this.$el.find('.select-all').prop('checked', false);
 
@@ -1192,6 +1199,20 @@
 				path = this.getCurrentDirectory();
 			}
 
+			// selection td
+			if (this._allowSelection) {
+				td = $('<td class="selection"></td>');
+
+				td.append(
+					'<input id="select-' + this.id + '-' + fileData.id +
+					'" type="checkbox" class="selectCheckBox checkbox"/><label for="select-' + this.id + '-' + fileData.id + '">' +
+					'<span class="hidden-visually">' + t('files', 'Select') + '</span>' +
+					'</label>'
+				);
+
+				tr.append(td);
+			}
+
 			// filename td
 			td = $('<td class="filename"></td>');
 
@@ -1203,22 +1224,13 @@
 			else {
 				linkUrl = this.getDownloadUrl(name, path, type === 'dir');
 			}
-			if (this._allowSelection) {
-				td.append(
-					'<input id="select-' + this.id + '-' + fileData.id +
-					'" type="checkbox" class="selectCheckBox checkbox"/><label for="select-' + this.id + '-' + fileData.id + '">' +
-					'<div class="thumbnail" style="background-image:url(' + icon + '); background-size: 32px;"></div>' +
-					'<span class="hidden-visually">' + t('files', 'Select') + '</span>' +
-					'</label>'
-				);
-			} else {
-				td.append('<div class="thumbnail" style="background-image:url(' + icon + '); background-size: 32px;"></div>');
-			}
 			var linkElem = $('<a></a>').attr({
 				"class": "name",
 				"href": linkUrl
 			});
 
+			linkElem.append('<div class="thumbnail-wrapper"><div class="thumbnail" style="background-image:url(' + icon + ');"></div></div>');
+
 			// from here work on the display name
 			name = fileData.displayName || name;
 
@@ -1673,6 +1685,7 @@
 				// close sidebar
 				this._updateDetailsView(null);
 			}
+			this._setCurrentDir(this.getCurrentDirectory(), false);
 			var callBack = this.reloadCallback.bind(this);
 			return this._reloadCall.then(callBack, callBack);
 		},
@@ -2614,6 +2627,13 @@
 		 */
 		_createSummary: function() {
 			var $tr = $('<tr class="summary"></tr>');
+
+			if (this._allowSelection) {
+				// Dummy column for selection, as all rows must have the same
+				// number of columns.
+				$tr.append('<td></td>');
+			}
+
 			this.$el.find('tfoot').append($tr);
 
 			return new OCA.Files.FileSummary($tr, {config: this._filesConfig});
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 9bd20be4bf8..747a7245a56 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -17,12 +17,12 @@
 		PROPERTY_FAVORITE:	'{' + OC.Files.Client.NS_OWNCLOUD + '}favorite'
 	});
 
-	var TEMPLATE_FAVORITE_ACTION =
-		'<a href="#" ' +
-		'class="action action-favorite {{#isFavorite}}permanent{{/isFavorite}}">' +
+	var TEMPLATE_FAVORITE_MARK =
+		'<div ' +
+		'class="favorite-mark {{#isFavorite}}permanent{{/isFavorite}}">' +
 		'<span class="icon {{iconClass}}" />' +
 		'<span class="hidden-visually">{{altText}}</span>' +
-		'</a>';
+		'</div>';
 
 	/**
 	 * Returns the icon class for the matching state
@@ -42,24 +42,24 @@
 	 */
 	function renderStar(state) {
 		if (!this._template) {
-			this._template = Handlebars.compile(TEMPLATE_FAVORITE_ACTION);
+			this._template = Handlebars.compile(TEMPLATE_FAVORITE_MARK);
 		}
 		return this._template({
 			isFavorite: state,
-			altText: state ? t('files', 'Favorited') : t('files', 'Favorite'),
+			altText: state ? t('files', 'Favorited') : t('files', 'Not favorited'),
 			iconClass: getStarIconClass(state)
 		});
 	}
 
 	/**
-	 * Toggle star icon on action element
+	 * Toggle star icon on favorite mark element
 	 *
-	 * @param {Object} action element
+	 * @param {Object} $favoriteMarkEl favorite mark element
 	 * @param {boolean} state true if starred, false otherwise
 	 */
-	function toggleStar($actionEl, state) {
-		$actionEl.removeClass('icon-star icon-starred').addClass(getStarIconClass(state));
-		$actionEl.toggleClass('permanent', state);
+	function toggleStar($favoriteMarkEl, state) {
+		$favoriteMarkEl.removeClass('icon-star icon-starred').addClass(getStarIconClass(state));
+		$favoriteMarkEl.toggleClass('permanent', state);
 	}
 
 	OCA.Files = OCA.Files || {};
@@ -67,8 +67,9 @@
 	/**
 	 * @namespace OCA.Files.TagsPlugin
 	 *
-	 * Extends the file actions and file list to include a favorite action icon
-	 * and addition "data-tags" and "data-favorite" attributes.
+	 * Extends the file actions and file list to include a favorite mark icon
+	 * and a favorite action in the file actions menu; it also adds "data-tags"
+	 * and "data-favorite" attributes to file elements.
 	 */
 	OCA.Files.TagsPlugin = {
 		name: 'Tags',
@@ -84,22 +85,38 @@
 
 		_extendFileActions: function(fileActions) {
 			var self = this;
-			// register "star" action
+
 			fileActions.registerAction({
 				name: 'Favorite',
-				displayName: t('files', 'Favorite'),
+				displayName: function(context) {
+					var $file = context.$file;
+					var isFavorite = $file.data('favorite') === true;
+
+					if (isFavorite) {
+						return t('files', 'Remove from favorites');
+					}
+
+					// As it is currently not possible to provide a context for
+					// the i18n strings "Add to favorites" was used instead of
+					// "Favorite" to remove the ambiguity between verb and noun
+					// when it is translated.
+					return t('files', 'Add to favorites');
+				},
 				mime: 'all',
+				order: -100,
 				permissions: OC.PERMISSION_READ,
-				type: OCA.Files.FileActions.TYPE_INLINE,
-				render: function(actionSpec, isDefault, context) {
+				iconClass: function(fileName, context) {
 					var $file = context.$file;
 					var isFavorite = $file.data('favorite') === true;
-					var $icon = $(renderStar(isFavorite));
-					$file.find('td:first>.favorite').replaceWith($icon);
-					return $icon;
+
+					if (isFavorite) {
+						return 'icon-star-dark';
+					}
+
+					return 'icon-starred';
 				},
 				actionHandler: function(fileName, context) {
-					var $actionEl = context.$file.find('.action-favorite');
+					var $favoriteMarkEl = context.$file.find('.favorite-mark');
 					var $file = context.$file;
 					var fileInfo = context.fileList.files[$file.index()];
 					var dir = context.dir || context.fileList.getCurrentDirectory();
@@ -118,14 +135,14 @@
 					}
 
 					// pre-toggle the star
-					toggleStar($actionEl, !isFavorite);
+					toggleStar($favoriteMarkEl, !isFavorite);
 
 					context.fileInfoModel.trigger('busy', context.fileInfoModel, true);
 
 					self.applyFileTags(
 						dir + '/' + fileName,
 						tags,
-						$actionEl,
+						$favoriteMarkEl,
 						isFavorite
 					).then(function(result) {
 						context.fileInfoModel.trigger('busy', context.fileInfoModel, false);
@@ -145,17 +162,19 @@
 
 		_extendFileList: function(fileList) {
 			// extend row prototype
-			fileList.$el.addClass('has-favorites');
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
 				var $tr = oldCreateRow.apply(this, arguments);
+				var isFavorite = false;
 				if (fileData.tags) {
 					$tr.attr('data-tags', fileData.tags.join('|'));
 					if (fileData.tags.indexOf(OC.TAG_FAVORITE) >= 0) {
 						$tr.attr('data-favorite', true);
+						isFavorite = true;
 					}
 				}
-				$tr.find('td:first').prepend('<div class="favorite"></div>');
+				var $icon = $(renderStar(isFavorite));
+				$tr.find('td.filename .thumbnail').append($icon);
 				return $tr;
 			};
 			var oldElementToFile = fileList.elementToFile;
@@ -215,10 +234,10 @@
 		 *
 		 * @param {String} fileName path to the file or folder to tag
 		 * @param {Array.<String>} tagNames array of tag names
-		 * @param {Object} $actionEl element
+		 * @param {Object} $favoriteMarkEl favorite mark element
 		 * @param {boolean} isFavorite Was the item favorited before
 		 */
-		applyFileTags: function(fileName, tagNames, $actionEl, isFavorite) {
+		applyFileTags: function(fileName, tagNames, $favoriteMarkEl, isFavorite) {
 			var encodedPath = OC.encodePath(fileName);
 			while (encodedPath[0] === '/') {
 				encodedPath = encodedPath.substr(1);
@@ -238,7 +257,7 @@
 					message = ': ' + response.responseJSON.message;
 				}
 				OC.Notification.show(t('files', 'An error occurred while trying to update the tags' + message), {type: 'error'});
-				toggleStar($actionEl, isFavorite);
+				toggleStar($favoriteMarkEl, isFavorite);
 			});
 		}
 	};
diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index f4bb7455e75..a23ea0d5ff2 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
     "Target folder \"{dir}\" does not exist any more" : "La carpeta objectiu \"{dir}\" ja no existeix",
     "Not enough free space" : "Espai lliure insuficient",
-    "Uploading …" : "S'està carregant",
     "…" : ".....",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "Actions" : "Accions",
@@ -123,7 +122,6 @@ OC.L10N.register(
     "Show hidden files" : "Mostra els fitxers ocults",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilitzeu aquesta adreça per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedir als vostres fitxers a través de WebDAV</a>",
-    "Uploading @" : "S'està carregant @",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 13beefbf4b1..aad9cb3b39d 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
     "Target folder \"{dir}\" does not exist any more" : "La carpeta objectiu \"{dir}\" ja no existeix",
     "Not enough free space" : "Espai lliure insuficient",
-    "Uploading …" : "S'està carregant",
     "…" : ".....",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "Actions" : "Accions",
@@ -121,7 +120,6 @@
     "Show hidden files" : "Mostra els fitxers ocults",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilitzeu aquesta adreça per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedir als vostres fitxers a través de WebDAV</a>",
-    "Uploading @" : "S'està carregant @",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
diff --git a/apps/files/l10n/cs.js b/apps/files/l10n/cs.js
index 6105c3e1163..e165e5a1580 100644
--- a/apps/files/l10n/cs.js
+++ b/apps/files/l10n/cs.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Cílový adresář \"{dir}\" již neexistuje",
     "Not enough free space" : "Nedostatek volného prostoru",
-    "Uploading …" : "Nahrávám...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "Actions" : "Činnosti",
@@ -123,7 +122,6 @@ OC.L10N.register(
     "Show hidden files" : "Zobrazit skryté soubory",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>",
-    "Uploading @" : "Nahrávám @",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V tomto adresáři nebylo nic nalezeno",
diff --git a/apps/files/l10n/cs.json b/apps/files/l10n/cs.json
index ed7dfac05e0..b48c6610553 100644
--- a/apps/files/l10n/cs.json
+++ b/apps/files/l10n/cs.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Cílový adresář \"{dir}\" již neexistuje",
     "Not enough free space" : "Nedostatek volného prostoru",
-    "Uploading …" : "Nahrávám...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "Actions" : "Činnosti",
@@ -121,7 +120,6 @@
     "Show hidden files" : "Zobrazit skryté soubory",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">přístup ke svým Souborům přes WebDAV</a>",
-    "Uploading @" : "Nahrávám @",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V tomto adresáři nebylo nic nalezeno",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index b8f4515cf74..ee70b6a15cd 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
     "Target folder \"{dir}\" does not exist any more" : "Destinations mappen \"{dir}\" eksistere ikke længere",
     "Not enough free space" : "Ikke nok fri plads",
-    "Uploading …" : "Uploader...",
+    "Uploading …" : "Uploader ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} af {totalSize} ({bitrate})",
     "Actions" : "Handlinger",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Foretrukken",
     "New folder" : "Ny Mappe",
     "Upload file" : "Upload fil",
+    "Not favorited" : "Ingen foretrukne",
+    "Remove from favorites" : "Fjern fra favoritter",
+    "Add to favorites" : "Tilføj til favoritter",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "Added to favorites" : "Tilføjet til favoritter",
     "Removed from favorites" : "Fjernet fra favoritter",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Brug denne adresse til at <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">tilgå dine filer via WebDAV</a>",
-    "Uploading @" : "Uploader @",
     "Cancel upload" : "Annuller upload ",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 7e5e35de51e..aed0a9b9715 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
     "Target folder \"{dir}\" does not exist any more" : "Destinations mappen \"{dir}\" eksistere ikke længere",
     "Not enough free space" : "Ikke nok fri plads",
-    "Uploading …" : "Uploader...",
+    "Uploading …" : "Uploader ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} af {totalSize} ({bitrate})",
     "Actions" : "Handlinger",
@@ -75,6 +75,9 @@
     "Favorite" : "Foretrukken",
     "New folder" : "Ny Mappe",
     "Upload file" : "Upload fil",
+    "Not favorited" : "Ingen foretrukne",
+    "Remove from favorites" : "Fjern fra favoritter",
+    "Add to favorites" : "Tilføj til favoritter",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "Added to favorites" : "Tilføjet til favoritter",
     "Removed from favorites" : "Fjernet fra favoritter",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Brug denne adresse til at <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">tilgå dine filer via WebDAV</a>",
-    "Uploading @" : "Uploader @",
     "Cancel upload" : "Annuller upload ",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 166166316ab..ca73ab73357 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
-    "Uploading …" : "Lade hoch…",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favorit",
     "New folder" : "Neuer Ordner",
     "Upload file" : "Datei hochladen",
+    "Not favorited" : "Nicht favorisiert",
+    "Remove from favorites" : "Von Favoriten entfernen",
+    "Add to favorites" : "Zu den Favoriten hinzufügen",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "Added to favorites" : "Zu den Favoriten hinzugefügt",
     "Removed from favorites" : "Aus den Favoriten entfernt",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Versteckte Dateien anzeigen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "Uploading @" : "Lade @ hoch",
     "Cancel upload" : "Hochladen abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Inhalte hochladen oder mit deinen Geräten synchronisieren!",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index f520dc86f13..0fa4becb1a9 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
-    "Uploading …" : "Lade hoch…",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
@@ -75,6 +75,9 @@
     "Favorite" : "Favorit",
     "New folder" : "Neuer Ordner",
     "Upload file" : "Datei hochladen",
+    "Not favorited" : "Nicht favorisiert",
+    "Remove from favorites" : "Von Favoriten entfernen",
+    "Add to favorites" : "Zu den Favoriten hinzufügen",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "Added to favorites" : "Zu den Favoriten hinzugefügt",
     "Removed from favorites" : "Aus den Favoriten entfernt",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Versteckte Dateien anzeigen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "Uploading @" : "Lade @ hoch",
     "Cancel upload" : "Hochladen abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Inhalte hochladen oder mit deinen Geräten synchronisieren!",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 91bf5dba7a5..12eec37f13c 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
-    "Uploading …" : "Lade hoch…",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favorit",
     "New folder" : "Neuer Ordner",
     "Upload file" : "Datei hochladen",
+    "Not favorited" : "Nicht favorisiert",
+    "Remove from favorites" : "Von Favoriten entfernen",
+    "Add to favorites" : "Zu den Favoriten hinzufügen",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "Added to favorites" : "Zu den Favoriten hinzugefügt",
     "Removed from favorites" : "Aus den Favoriten entfernt",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Versteckte Dateien anzeigen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "Uploading @" : "Lade @ hoch",
     "Cancel upload" : "Hochladen abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index dcb310ae707..346562edbe9 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Target folder \"{dir}\" does not exist any more" : "Ziel-Verzeichnis \"{dir}\" existiert nicht mehr",
     "Not enough free space" : "Nicht genügend freier Speicherplatz",
-    "Uploading …" : "Lade hoch…",
+    "Uploading …" : "Lade hoch...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} von {totalSize} ({bitrate})",
     "Actions" : "Aktionen",
@@ -75,6 +75,9 @@
     "Favorite" : "Favorit",
     "New folder" : "Neuer Ordner",
     "Upload file" : "Datei hochladen",
+    "Not favorited" : "Nicht favorisiert",
+    "Remove from favorites" : "Von Favoriten entfernen",
+    "Add to favorites" : "Zu den Favoriten hinzufügen",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "Added to favorites" : "Zu den Favoriten hinzugefügt",
     "Removed from favorites" : "Aus den Favoriten entfernt",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Versteckte Dateien anzeigen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "Uploading @" : "Lade @ hoch",
     "Cancel upload" : "Hochladen abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index b7a8dca505d..89a1bdda6b9 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favourite",
     "New folder" : "New folder",
     "Upload file" : "Upload file",
+    "Not favorited" : "Not favourited",
+    "Remove from favorites" : "Remove from favourites",
+    "Add to favorites" : "Add to favourites",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "Added to favorites" : "Added to favourites",
     "Removed from favorites" : "Removed from favourites",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Show hidden files",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>",
-    "Uploading @" : "Uploading @",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 0d93f91e4cc..f0c1aff46d3 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -75,6 +75,9 @@
     "Favorite" : "Favourite",
     "New folder" : "New folder",
     "Upload file" : "Upload file",
+    "Not favorited" : "Not favourited",
+    "Remove from favorites" : "Remove from favourites",
+    "Add to favorites" : "Add to favourites",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "Added to favorites" : "Added to favourites",
     "Removed from favorites" : "Removed from favourites",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Show hidden files",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>",
-    "Uploading @" : "Uploading @",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index cc6a73fdf7f..40955586567 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favorito",
     "New folder" : "Nueva carpeta",
     "Upload file" : "Subir archivo",
+    "Not favorited" : "No marcado como favorito",
+    "Remove from favorites" : "Eliminar de favoritos",
+    "Add to favorites" : "Añadir a favoritos",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "Added to favorites" : "Agregado a favoritos",
     "Removed from favorites" : "Borrado de favoritos",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Mostrar archivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos mediante WebDAV</a>",
-    "Uploading @" : "Subiendo a ",
     "Cancel upload" : "Cancelar subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "¡Suba contenidos o sincronice sus dispositivos!",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 6f5cca13a7a..76ca1811364 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -75,6 +75,9 @@
     "Favorite" : "Favorito",
     "New folder" : "Nueva carpeta",
     "Upload file" : "Subir archivo",
+    "Not favorited" : "No marcado como favorito",
+    "Remove from favorites" : "Eliminar de favoritos",
+    "Add to favorites" : "Añadir a favoritos",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "Added to favorites" : "Agregado a favoritos",
     "Removed from favorites" : "Borrado de favoritos",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Mostrar archivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos mediante WebDAV</a>",
-    "Uploading @" : "Subiendo a ",
     "Cancel upload" : "Cancelar subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "¡Suba contenidos o sincronice sus dispositivos!",
diff --git a/apps/files/l10n/es_CO.js b/apps/files/l10n/es_CO.js
new file mode 100644
index 00000000000..4f242d15a7a
--- /dev/null
+++ b/apps/files/l10n/es_CO.js
@@ -0,0 +1,160 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
+    "Storage invalid" : "El almacenamiento es inválido",
+    "Unknown error" : "Se presentó un error desconocido",
+    "All files" : "Todos los archivos",
+    "Recent" : "Reciente",
+    "File could not be found" : "No fue posible encontrar el archivo",
+    "Home" : "Inicio",
+    "Close" : "Cerrar",
+    "Favorites" : "Favoritos",
+    "Could not create folder \"{dir}\"" : "No fue posible crear la carpeta \"{dir}\"",
+    "Upload cancelled." : "Carga cancelada.",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No fue posible cargar {filename} ya que es una carpeta o tiene un tamaño de 0 bytes",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No tienes suficiente espacio disponible, Estas cargando {size1} pero sólo cuentas con {size2} disponible",
+    "Target folder \"{dir}\" does not exist any more" : "La carpeta destino \"{dir}\" ya no existe",
+    "Not enough free space" : "No cuentas con suficiente espacio libre",
+    "…" : "...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
+    "Actions" : "Acciones",
+    "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Move or copy" : "Mover o copiar",
+    "Target folder" : "Carpeta destino",
+    "Delete" : "Borrar",
+    "Disconnect storage" : "Desconectar almacenamiento",
+    "Unshare" : "Dejar de compartir",
+    "Could not load info for file \"{file}\"" : "No fue posible cargar información para el archivo \"{file}\"",
+    "Files" : "Archivos",
+    "Details" : "Detalles",
+    "Select" : "Seleccionar",
+    "Pending" : "Pendiente",
+    "Unable to determine date" : "No fue posible determinar la fecha",
+    "This operation is forbidden" : "Esta operación está prohibida",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
+    "Could not move \"{file}\", target exists" : "No fue posible mover \"{file}\", el destino ya existe",
+    "Could not move \"{file}\"" : "No fue posible mover \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "No se pudo copiar \"{file}\", el destino ya existe",
+    "Could not copy \"{file}\"" : "No se pudo copiar \"{file}\"",
+    "Copied {origin} inside {destination}" : "{origin} fue copiado dentro de {destination}",
+    "Copied {origin} and {nbfiles} other files inside {destination}" : "{origin} y otros {nbfiles} archivos fueron copiados dentro de {destination}",
+    "{newName} already exists" : "{newName} ya existe",
+    "Could not rename \"{fileName}\", it does not exist any more" : "No fue posible renombrar \"{fileName}\", ya no existe",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya está en uso en la carpeta \"{dir}\". Por favor elege un nombre diferete. ",
+    "Could not rename \"{fileName}\"" : "No fue posible renombrar \"{fileName}\"",
+    "Could not create file \"{file}\"" : "No fue posible crear el archivo \"{file}\"",
+    "Could not create file \"{file}\" because it already exists" : "No fue posible crear el archivo\"{file}\" porque ya existe",
+    "Could not create folder \"{dir}\" because it already exists" : "No fue posible crear la carpeta \"{dir}\" porque ya existe",
+    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n escondido","incluyendo %n ocultos"],
+    "You don’t have permission to upload or create files here" : "No cuentas con los permisos para cargar o crear archivos aquí",
+    "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Cargando %n archivos"],
+    "New" : "Nuevo",
+    "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido. ",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "\"{name}\" is not an allowed filetype" : "\"{name}\" es un tipo de archivo no permitido",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "El espacio de {owner} está lleno. ¡Los archivos ya no se pueden actualizar o sincronizar!",
+    "Your storage is full, files can not be updated or synced anymore!" : "Tu espacio está lleno. ¡Los archivos ya no se pueden actualizar o sincronizar!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El espacio de {owner} está casi lleno ({usedSpacePercent}%)",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Tu espacio está casi lleno ({usedSpacePercent}%)",
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincide '{filter}'","coincidencia '{filter}'"],
+    "View in folder" : "Ver en la carpeta",
+    "Copied!" : "¡Copiado!",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar liga directa (sólo funciona para usuarios que tienen acceso a este archivo/carpeta)",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
+    "Favorited" : "Marcado como favorito",
+    "Favorite" : "Favorito",
+    "New folder" : "Carpeta nueva",
+    "Upload file" : "Cargar archivo",
+    "An error occurred while trying to update the tags" : "Se presentó un error al intentar actualizar la etiqueta",
+    "Added to favorites" : "Agregado a los favoritos",
+    "Removed from favorites" : "Eliminado de los favoritos",
+    "You added {file} to your favorites" : "Agregaste {file} a tus favoritos",
+    "You removed {file} from your favorites" : "Eliminaste {file} de tus favoritos",
+    "File changes" : "Cambios al archivo",
+    "Created by {user}" : "Creado por {user}",
+    "Changed by {user}" : "Cambiado por {user}",
+    "Deleted by {user}" : "Borrado por {user}",
+    "Restored by {user}" : "Restaurado por {user}",
+    "Renamed by {user}" : "Renombrado por {user}",
+    "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuario remoto\"",
+    "You created {file}" : "Creaste {file}",
+    "{user} created {file}" : "{user} creó {file}",
+    "{file} was created in a public folder" : "{file} fue creado en una carpeta pública",
+    "You changed {file}" : "Cambiaste {file}",
+    "{user} changed {file}" : "{user} cambió {file}",
+    "You deleted {file}" : "Borraste {file}",
+    "{user} deleted {file}" : "{user} borró {file}",
+    "You restored {file}" : "Restauraste {file}",
+    "{user} restored {file}" : "{user} restauró {file}",
+    "You renamed {oldfile} to {newfile}" : "Renombraste {oldfile} como {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} renombró {oldfile} como {newfile}",
+    "You moved {oldfile} to {newfile}" : "Moviste {oldfile} a {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} movió {oldfile} a {newfile}",
+    "A file has been added to or removed from your <strong>favorites</strong>" : "Un archivo ha sido agregado o eliminado de tus <strong>favoritos</strong>",
+    "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado </strong> o <strong>renombrado</strong>",
+    "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
+    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>borrado</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita las notificaciones de la creación y cambios a tus <strong>archivos favoritos</strong> <em>(sólo flujo)</em>",
+    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
+    "Unlimited" : "Ilimitado",
+    "Upload (max. %s)" : "Cargar (max. %s)",
+    "File handling" : "Manejo de archivos",
+    "Maximum upload size" : "Tamaño máximo de carga",
+    "max. possible: " : "max. posible:",
+    "Save" : "Guardar",
+    "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios apliquen. ",
+    "Missing permissions to edit from here." : "Faltan privilegios para editar desde aquí. ",
+    "%s of %s used" : "%s de %s usado",
+    "%s used" : "%s usado",
+    "Settings" : "Configuraciones ",
+    "Show hidden files" : "Mostrar archivos ocultos",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos vía WebDAV</a>",
+    "Cancel upload" : "Cancelar carga",
+    "No files in here" : "No hay archivos aquí",
+    "Upload some content or sync with your devices!" : "¡Carga algún contenido o sincroniza con tus dispositivos!",
+    "No entries found in this folder" : "No se encontraron elementos en esta carpeta",
+    "Select all" : "Seleccionar todo",
+    "Upload too large" : "La carga es demasido grande",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando cargar sobrepasan el tamaño máximo permitido para la carga de archivos en este servidor.",
+    "No favorites yet" : "Aún no hay favoritos",
+    "Files and folders you mark as favorite will show up here" : "Los archivos y carpetas que marques como favoritos se mostrarán aquí. ",
+    "Shared with you" : "Compartido con usted",
+    "Shared with others" : "Compartido con otros",
+    "Shared by link" : "Compartido por liga",
+    "Tags" : "Etiquetas",
+    "Deleted files" : "Archivos borrados",
+    "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo ArchivoDeTexto.txt",
+    "Uploading..." : "Cargando...",
+    "..." : "...",
+    "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["falta {hours}:{minutes}:{seconds} hora","faltan {hours}:{minutes}:{seconds} horas"],
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["falta {minutes}:{seconds} minuto","faltan {minutes}:{seconds} minutos"],
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "_{seconds} second left_::_{seconds} seconds left_" : ["falta {seconds} segundo","faltan {seconds} segundos"],
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "En cualquier momento...",
+    "Soon..." : "Pronto...",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La carga del archivo está en curso. El salir de la página ahora, la cancelará. ",
+    "Move" : "Mover",
+    "Copy local link" : "Copiar liga local",
+    "Folder" : "Carpeta",
+    "Upload" : "Cargar",
+    "A new file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>borrado</strong>",
+    "A new file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
+    "No favorites" : "No hay favoritos"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CO.json b/apps/files/l10n/es_CO.json
new file mode 100644
index 00000000000..284e43b4ab6
--- /dev/null
+++ b/apps/files/l10n/es_CO.json
@@ -0,0 +1,158 @@
+{ "translations": {
+    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
+    "Storage invalid" : "El almacenamiento es inválido",
+    "Unknown error" : "Se presentó un error desconocido",
+    "All files" : "Todos los archivos",
+    "Recent" : "Reciente",
+    "File could not be found" : "No fue posible encontrar el archivo",
+    "Home" : "Inicio",
+    "Close" : "Cerrar",
+    "Favorites" : "Favoritos",
+    "Could not create folder \"{dir}\"" : "No fue posible crear la carpeta \"{dir}\"",
+    "Upload cancelled." : "Carga cancelada.",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No fue posible cargar {filename} ya que es una carpeta o tiene un tamaño de 0 bytes",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No tienes suficiente espacio disponible, Estas cargando {size1} pero sólo cuentas con {size2} disponible",
+    "Target folder \"{dir}\" does not exist any more" : "La carpeta destino \"{dir}\" ya no existe",
+    "Not enough free space" : "No cuentas con suficiente espacio libre",
+    "…" : "...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
+    "Actions" : "Acciones",
+    "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Move or copy" : "Mover o copiar",
+    "Target folder" : "Carpeta destino",
+    "Delete" : "Borrar",
+    "Disconnect storage" : "Desconectar almacenamiento",
+    "Unshare" : "Dejar de compartir",
+    "Could not load info for file \"{file}\"" : "No fue posible cargar información para el archivo \"{file}\"",
+    "Files" : "Archivos",
+    "Details" : "Detalles",
+    "Select" : "Seleccionar",
+    "Pending" : "Pendiente",
+    "Unable to determine date" : "No fue posible determinar la fecha",
+    "This operation is forbidden" : "Esta operación está prohibida",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
+    "Could not move \"{file}\", target exists" : "No fue posible mover \"{file}\", el destino ya existe",
+    "Could not move \"{file}\"" : "No fue posible mover \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "No se pudo copiar \"{file}\", el destino ya existe",
+    "Could not copy \"{file}\"" : "No se pudo copiar \"{file}\"",
+    "Copied {origin} inside {destination}" : "{origin} fue copiado dentro de {destination}",
+    "Copied {origin} and {nbfiles} other files inside {destination}" : "{origin} y otros {nbfiles} archivos fueron copiados dentro de {destination}",
+    "{newName} already exists" : "{newName} ya existe",
+    "Could not rename \"{fileName}\", it does not exist any more" : "No fue posible renombrar \"{fileName}\", ya no existe",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya está en uso en la carpeta \"{dir}\". Por favor elege un nombre diferete. ",
+    "Could not rename \"{fileName}\"" : "No fue posible renombrar \"{fileName}\"",
+    "Could not create file \"{file}\"" : "No fue posible crear el archivo \"{file}\"",
+    "Could not create file \"{file}\" because it already exists" : "No fue posible crear el archivo\"{file}\" porque ya existe",
+    "Could not create folder \"{dir}\" because it already exists" : "No fue posible crear la carpeta \"{dir}\" porque ya existe",
+    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n escondido","incluyendo %n ocultos"],
+    "You don’t have permission to upload or create files here" : "No cuentas con los permisos para cargar o crear archivos aquí",
+    "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Cargando %n archivos"],
+    "New" : "Nuevo",
+    "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido. ",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "\"{name}\" is not an allowed filetype" : "\"{name}\" es un tipo de archivo no permitido",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "El espacio de {owner} está lleno. ¡Los archivos ya no se pueden actualizar o sincronizar!",
+    "Your storage is full, files can not be updated or synced anymore!" : "Tu espacio está lleno. ¡Los archivos ya no se pueden actualizar o sincronizar!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El espacio de {owner} está casi lleno ({usedSpacePercent}%)",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Tu espacio está casi lleno ({usedSpacePercent}%)",
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincide '{filter}'","coincidencia '{filter}'"],
+    "View in folder" : "Ver en la carpeta",
+    "Copied!" : "¡Copiado!",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copiar liga directa (sólo funciona para usuarios que tienen acceso a este archivo/carpeta)",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
+    "Favorited" : "Marcado como favorito",
+    "Favorite" : "Favorito",
+    "New folder" : "Carpeta nueva",
+    "Upload file" : "Cargar archivo",
+    "An error occurred while trying to update the tags" : "Se presentó un error al intentar actualizar la etiqueta",
+    "Added to favorites" : "Agregado a los favoritos",
+    "Removed from favorites" : "Eliminado de los favoritos",
+    "You added {file} to your favorites" : "Agregaste {file} a tus favoritos",
+    "You removed {file} from your favorites" : "Eliminaste {file} de tus favoritos",
+    "File changes" : "Cambios al archivo",
+    "Created by {user}" : "Creado por {user}",
+    "Changed by {user}" : "Cambiado por {user}",
+    "Deleted by {user}" : "Borrado por {user}",
+    "Restored by {user}" : "Restaurado por {user}",
+    "Renamed by {user}" : "Renombrado por {user}",
+    "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuario remoto\"",
+    "You created {file}" : "Creaste {file}",
+    "{user} created {file}" : "{user} creó {file}",
+    "{file} was created in a public folder" : "{file} fue creado en una carpeta pública",
+    "You changed {file}" : "Cambiaste {file}",
+    "{user} changed {file}" : "{user} cambió {file}",
+    "You deleted {file}" : "Borraste {file}",
+    "{user} deleted {file}" : "{user} borró {file}",
+    "You restored {file}" : "Restauraste {file}",
+    "{user} restored {file}" : "{user} restauró {file}",
+    "You renamed {oldfile} to {newfile}" : "Renombraste {oldfile} como {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} renombró {oldfile} como {newfile}",
+    "You moved {oldfile} to {newfile}" : "Moviste {oldfile} a {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} movió {oldfile} a {newfile}",
+    "A file has been added to or removed from your <strong>favorites</strong>" : "Un archivo ha sido agregado o eliminado de tus <strong>favoritos</strong>",
+    "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado </strong> o <strong>renombrado</strong>",
+    "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
+    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>borrado</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limita las notificaciones de la creación y cambios a tus <strong>archivos favoritos</strong> <em>(sólo flujo)</em>",
+    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
+    "Unlimited" : "Ilimitado",
+    "Upload (max. %s)" : "Cargar (max. %s)",
+    "File handling" : "Manejo de archivos",
+    "Maximum upload size" : "Tamaño máximo de carga",
+    "max. possible: " : "max. posible:",
+    "Save" : "Guardar",
+    "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tomar 5 minutos para que los cambios apliquen. ",
+    "Missing permissions to edit from here." : "Faltan privilegios para editar desde aquí. ",
+    "%s of %s used" : "%s de %s usado",
+    "%s used" : "%s usado",
+    "Settings" : "Configuraciones ",
+    "Show hidden files" : "Mostrar archivos ocultos",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos vía WebDAV</a>",
+    "Cancel upload" : "Cancelar carga",
+    "No files in here" : "No hay archivos aquí",
+    "Upload some content or sync with your devices!" : "¡Carga algún contenido o sincroniza con tus dispositivos!",
+    "No entries found in this folder" : "No se encontraron elementos en esta carpeta",
+    "Select all" : "Seleccionar todo",
+    "Upload too large" : "La carga es demasido grande",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando cargar sobrepasan el tamaño máximo permitido para la carga de archivos en este servidor.",
+    "No favorites yet" : "Aún no hay favoritos",
+    "Files and folders you mark as favorite will show up here" : "Los archivos y carpetas que marques como favoritos se mostrarán aquí. ",
+    "Shared with you" : "Compartido con usted",
+    "Shared with others" : "Compartido con otros",
+    "Shared by link" : "Compartido por liga",
+    "Tags" : "Etiquetas",
+    "Deleted files" : "Archivos borrados",
+    "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo ArchivoDeTexto.txt",
+    "Uploading..." : "Cargando...",
+    "..." : "...",
+    "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["falta {hours}:{minutes}:{seconds} hora","faltan {hours}:{minutes}:{seconds} horas"],
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["falta {minutes}:{seconds} minuto","faltan {minutes}:{seconds} minutos"],
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "_{seconds} second left_::_{seconds} seconds left_" : ["falta {seconds} segundo","faltan {seconds} segundos"],
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "En cualquier momento...",
+    "Soon..." : "Pronto...",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La carga del archivo está en curso. El salir de la página ahora, la cancelará. ",
+    "Move" : "Mover",
+    "Copy local link" : "Copiar liga local",
+    "Folder" : "Carpeta",
+    "Upload" : "Cargar",
+    "A new file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>borrado</strong>",
+    "A new file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
+    "No favorites" : "No hay favoritos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index 2c4adea018e..4f242d15a7a 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No tienes suficiente espacio disponible, Estas cargando {size1} pero sólo cuentas con {size2} disponible",
     "Target folder \"{dir}\" does not exist any more" : "La carpeta destino \"{dir}\" ya no existe",
     "Not enough free space" : "No cuentas con suficiente espacio libre",
-    "Uploading …" : "Cargando ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "Actions" : "Acciones",
@@ -123,7 +122,6 @@ OC.L10N.register(
     "Show hidden files" : "Mostrar archivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos vía WebDAV</a>",
-    "Uploading @" : "Actualizando @",
     "Cancel upload" : "Cancelar carga",
     "No files in here" : "No hay archivos aquí",
     "Upload some content or sync with your devices!" : "¡Carga algún contenido o sincroniza con tus dispositivos!",
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index b783e8b08f5..284e43b4ab6 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No tienes suficiente espacio disponible, Estas cargando {size1} pero sólo cuentas con {size2} disponible",
     "Target folder \"{dir}\" does not exist any more" : "La carpeta destino \"{dir}\" ya no existe",
     "Not enough free space" : "No cuentas con suficiente espacio libre",
-    "Uploading …" : "Cargando ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
     "Actions" : "Acciones",
@@ -121,7 +120,6 @@
     "Show hidden files" : "Mostrar archivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Usa esta dirección para <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">acceder tus archivos vía WebDAV</a>",
-    "Uploading @" : "Actualizando @",
     "Cancel upload" : "Cancelar carga",
     "No files in here" : "No hay archivos aquí",
     "Upload some content or sync with your devices!" : "¡Carga algún contenido o sincroniza con tus dispositivos!",
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index 74b386761ca..ee01092fb64 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
     "Target folder \"{dir}\" does not exist any more" : "Kausta \"{dir}\" pole enam olemas",
     "Not enough free space" : "Pole piisavalt vaba ruumi",
-    "Uploading …" : "Üleslaadminie ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{loadedSize} ({bitrate})",
     "Actions" : "Tegevused",
@@ -118,7 +117,6 @@ OC.L10N.register(
     "Show hidden files" : "Näita peidetud faile",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Kasuta seda aadressi, et <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">oma failidele WebDAV kaudu ligi pääseda</a>",
-    "Uploading @" : "Üleslaadimine @",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
     "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index b1489a9a214..30af89aa3e3 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
     "Target folder \"{dir}\" does not exist any more" : "Kausta \"{dir}\" pole enam olemas",
     "Not enough free space" : "Pole piisavalt vaba ruumi",
-    "Uploading …" : "Üleslaadminie ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{loadedSize} ({bitrate})",
     "Actions" : "Tegevused",
@@ -116,7 +115,6 @@
     "Show hidden files" : "Näita peidetud faile",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Kasuta seda aadressi, et <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">oma failidele WebDAV kaudu ligi pääseda</a>",
-    "Uploading @" : "Üleslaadimine @",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
     "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index 10777541bdd..af69bc93958 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -16,12 +16,13 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
     "Target folder \"{dir}\" does not exist any more" : "\"{dir}\" karpeta ez du gehiago existitzen",
     "Not enough free space" : "Ez dago nahiko leku librea",
-    "Uploading …" : "Igotzen …",
+    "Uploading …" : "Igotzen...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Rename" : "Berrizendatu",
+    "Move or copy" : "Mugitu edo kopiatu",
     "Target folder" : "Xede karpeta",
     "Delete" : "Ezabatu",
     "Disconnect storage" : "Deskonektatu biltegia",
@@ -36,6 +37,10 @@ OC.L10N.register(
     "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, begira itzazu erregistroa edo administratzailearekin harremanetan jarri",
     "Could not move \"{file}\", target exists" : "Ezin da \"{file}\" mugitu, helburuan existitzen da jadanik",
     "Could not move \"{file}\"" : "Ezin da mugitu \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "Ezin da \"{file}\" kopiatu; helburuan existitzen da",
+    "Could not copy \"{file}\"" : "Ezin da \"{file}\" kopiatu",
+    "Copied {origin} inside {destination}" : "{origin} {destination} barruan kopiatu da",
+    "Copied {origin} and {nbfiles} other files inside {destination}" : "{origin} eta {nbfiles} beste fitxategiak {destination}-en kopiatu dira",
     "{newName} already exists" : "{newName} existitzen da dagoeneko",
     "Could not rename \"{fileName}\", it does not exist any more" : "Ezin izan da \"{fileName}\" berrizendatu, ez da existitzen",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "\"{targetName}\" izena dagoeneko dago erabilita \"{dir}\" karpetan. Mesedez, beste bat aukeratu.",
@@ -72,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Gogokoa",
     "New folder" : "Karpeta berria",
     "Upload file" : "Igo fitxategia",
+    "Not favorited" : "Ez da gogokoa",
+    "Remove from favorites" : "Gogokoetatik kenduta",
+    "Add to favorites" : "Gogokoetara gehitu",
     "An error occurred while trying to update the tags" : "Errore bat gertatu da etiketak eguneratzerakoan",
     "Added to favorites" : "Gogokoetan gehitu da",
     "Removed from favorites" : "Gogokoetatik kendu da",
@@ -118,7 +126,7 @@ OC.L10N.register(
     "Show hidden files" : "Erakutsi ezkutuko fitxategiak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Erabili helbide hau <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV bidez zure fitxategietara sartzeko </a> ",
-    "Uploading @" : "Igotzen @",
+    "Cancel upload" : "Igoera bertan behera utzita",
     "No files in here" : "Ez dago fitxategirik hemen",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index d3dbffe1cd7..151eed97867 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -14,12 +14,13 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
     "Target folder \"{dir}\" does not exist any more" : "\"{dir}\" karpeta ez du gehiago existitzen",
     "Not enough free space" : "Ez dago nahiko leku librea",
-    "Uploading …" : "Igotzen …",
+    "Uploading …" : "Igotzen...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Rename" : "Berrizendatu",
+    "Move or copy" : "Mugitu edo kopiatu",
     "Target folder" : "Xede karpeta",
     "Delete" : "Ezabatu",
     "Disconnect storage" : "Deskonektatu biltegia",
@@ -34,6 +35,10 @@
     "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, begira itzazu erregistroa edo administratzailearekin harremanetan jarri",
     "Could not move \"{file}\", target exists" : "Ezin da \"{file}\" mugitu, helburuan existitzen da jadanik",
     "Could not move \"{file}\"" : "Ezin da mugitu \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "Ezin da \"{file}\" kopiatu; helburuan existitzen da",
+    "Could not copy \"{file}\"" : "Ezin da \"{file}\" kopiatu",
+    "Copied {origin} inside {destination}" : "{origin} {destination} barruan kopiatu da",
+    "Copied {origin} and {nbfiles} other files inside {destination}" : "{origin} eta {nbfiles} beste fitxategiak {destination}-en kopiatu dira",
     "{newName} already exists" : "{newName} existitzen da dagoeneko",
     "Could not rename \"{fileName}\", it does not exist any more" : "Ezin izan da \"{fileName}\" berrizendatu, ez da existitzen",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "\"{targetName}\" izena dagoeneko dago erabilita \"{dir}\" karpetan. Mesedez, beste bat aukeratu.",
@@ -70,6 +75,9 @@
     "Favorite" : "Gogokoa",
     "New folder" : "Karpeta berria",
     "Upload file" : "Igo fitxategia",
+    "Not favorited" : "Ez da gogokoa",
+    "Remove from favorites" : "Gogokoetatik kenduta",
+    "Add to favorites" : "Gogokoetara gehitu",
     "An error occurred while trying to update the tags" : "Errore bat gertatu da etiketak eguneratzerakoan",
     "Added to favorites" : "Gogokoetan gehitu da",
     "Removed from favorites" : "Gogokoetatik kendu da",
@@ -116,7 +124,7 @@
     "Show hidden files" : "Erakutsi ezkutuko fitxategiak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Erabili helbide hau <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">WebDAV bidez zure fitxategietara sartzeko </a> ",
-    "Uploading @" : "Igotzen @",
+    "Cancel upload" : "Igoera bertan behera utzita",
     "No files in here" : "Ez dago fitxategirik hemen",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
diff --git a/apps/files/l10n/fi.js b/apps/files/l10n/fi.js
index 98e91b172a4..3edbbc8ba14 100644
--- a/apps/files/l10n/fi.js
+++ b/apps/files/l10n/fi.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
     "Target folder \"{dir}\" does not exist any more" : "Kohdekansio \"{dir}\" ei ole enää olemassa",
     "Not enough free space" : "Ei tarpeeksi vapaata tilaa",
-    "Uploading …" : "Lähetetään…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})",
     "Actions" : "Toiminnot",
@@ -121,7 +120,7 @@ OC.L10N.register(
     "Show hidden files" : "Näytä piilotetut tiedostot",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>",
-    "Uploading @" : "Lähetetään @",
+    "Cancel upload" : "Perus lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json
index 3148ed7f29b..54fe53b85ab 100644
--- a/apps/files/l10n/fi.json
+++ b/apps/files/l10n/fi.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
     "Target folder \"{dir}\" does not exist any more" : "Kohdekansio \"{dir}\" ei ole enää olemassa",
     "Not enough free space" : "Ei tarpeeksi vapaata tilaa",
-    "Uploading …" : "Lähetetään…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize}/{totalSize} ({bitrate})",
     "Actions" : "Toiminnot",
@@ -119,7 +118,7 @@
     "Show hidden files" : "Näytä piilotetut tiedostot",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">päästäksesi tiedostoihisi WebDAV-liittymän kautta</a>",
-    "Uploading @" : "Lähetetään @",
+    "Cancel upload" : "Perus lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 0111a0d02dc..9574a557cd3 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
     "Target folder \"{dir}\" does not exist any more" : "Le dossier cible « {dir} » n'existe plus",
     "Not enough free space" : "Espace disponible insuffisant",
-    "Uploading …" : "Téléversement...",
+    "Uploading …" : "Téléversement en cours...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "Actions" : "Actions",
@@ -77,6 +77,8 @@ OC.L10N.register(
     "Favorite" : "Favoris",
     "New folder" : "Nouveau dossier",
     "Upload file" : "Téléverser un fichier",
+    "Remove from favorites" : "Retirer des favoris",
+    "Add to favorites" : "Ajouter aux favoris",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "Added to favorites" : "Ajouté aux favoris",
     "Removed from favorites" : "Retiré des favoris",
@@ -123,7 +125,6 @@ OC.L10N.register(
     "Show hidden files" : "Afficher les fichiers cachés",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>",
-    "Uploading @" : "Envoi en cours @",
     "Cancel upload" : "Annuler le téléversement",
     "No files in here" : "Aucun fichier",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 0cc1f32c479..21074489eec 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
     "Target folder \"{dir}\" does not exist any more" : "Le dossier cible « {dir} » n'existe plus",
     "Not enough free space" : "Espace disponible insuffisant",
-    "Uploading …" : "Téléversement...",
+    "Uploading …" : "Téléversement en cours...",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "Actions" : "Actions",
@@ -75,6 +75,8 @@
     "Favorite" : "Favoris",
     "New folder" : "Nouveau dossier",
     "Upload file" : "Téléverser un fichier",
+    "Remove from favorites" : "Retirer des favoris",
+    "Add to favorites" : "Ajouter aux favoris",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "Added to favorites" : "Ajouté aux favoris",
     "Removed from favorites" : "Retiré des favoris",
@@ -121,7 +123,6 @@
     "Show hidden files" : "Afficher les fichiers cachés",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accéder à vos fichiers par WebDAV</a>",
-    "Uploading @" : "Envoi en cours @",
     "Cancel upload" : "Annuler le téléversement",
     "No files in here" : "Aucun fichier",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
diff --git a/apps/files/l10n/hu.js b/apps/files/l10n/hu.js
index 694aeb1e614..0c770e4a1db 100644
--- a/apps/files/l10n/hu.js
+++ b/apps/files/l10n/hu.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
     "Target folder \"{dir}\" does not exist any more" : "A cél mappa már nem létezik: \"{dir}\"",
     "Not enough free space" : "Nincs elég szabad hely",
-    "Uploading …" : "Feltöltés ...",
+    "Uploading …" : "Feltöltés...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "Actions" : "Műveletek",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Kedvenc",
     "New folder" : "Új mappa",
     "Upload file" : "Fájl feltöltés",
+    "Not favorited" : "Nincs a kedvencek között",
+    "Remove from favorites" : "Eltávolítás a kedvencekből",
+    "Add to favorites" : "Hozzáadás a kedvencekhez",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "Added to favorites" : "Hozzáadva a kedvencekhez",
     "Removed from favorites" : "Eltávolítva a kedvencekből",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Rejtett fájlok megjelenítése",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.",
-    "Uploading @" : "Feltöltés @",
     "Cancel upload" : "Feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
diff --git a/apps/files/l10n/hu.json b/apps/files/l10n/hu.json
index 9dc06fb48fd..9e7d724c06e 100644
--- a/apps/files/l10n/hu.json
+++ b/apps/files/l10n/hu.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
     "Target folder \"{dir}\" does not exist any more" : "A cél mappa már nem létezik: \"{dir}\"",
     "Not enough free space" : "Nincs elég szabad hely",
-    "Uploading …" : "Feltöltés ...",
+    "Uploading …" : "Feltöltés...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "Actions" : "Műveletek",
@@ -75,6 +75,9 @@
     "Favorite" : "Kedvenc",
     "New folder" : "Új mappa",
     "Upload file" : "Fájl feltöltés",
+    "Not favorited" : "Nincs a kedvencek között",
+    "Remove from favorites" : "Eltávolítás a kedvencekből",
+    "Add to favorites" : "Hozzáadás a kedvencekhez",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "Added to favorites" : "Hozzáadva a kedvencekhez",
     "Removed from favorites" : "Eltávolítva a kedvencekből",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Rejtett fájlok megjelenítése",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Használja ezt a címet <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">a Fájlok eléréséhez WebDAV-on keresztül</a>.",
-    "Uploading @" : "Feltöltés @",
     "Cancel upload" : "Feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index d1254091676..65256f1548f 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Eftirlæti",
     "New folder" : "Ný mappa",
     "Upload file" : "Senda inn skrá",
+    "Not favorited" : "Ekki í eftirlætum",
+    "Remove from favorites" : "Fjarlægja úr eftirlætum",
+    "Add to favorites" : "Bæta í eftirlæti",
     "An error occurred while trying to update the tags" : "Villa kom upp við að reyna að uppfæra merkin",
     "Added to favorites" : "Bætt í eftirlæti",
     "Removed from favorites" : "Fjarlægt úr eftirlætum",
@@ -123,7 +126,7 @@ OC.L10N.register(
     "Show hidden files" : "Sýna faldar skrár",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>",
-    "Uploading @" : "Sendi inn @",
+    "Cancel upload" : "Hætta við innsendingu",
     "No files in here" : "Engar skrár hér",
     "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 80c56f26ce4..29b8d7eb79a 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -75,6 +75,9 @@
     "Favorite" : "Eftirlæti",
     "New folder" : "Ný mappa",
     "Upload file" : "Senda inn skrá",
+    "Not favorited" : "Ekki í eftirlætum",
+    "Remove from favorites" : "Fjarlægja úr eftirlætum",
+    "Add to favorites" : "Bæta í eftirlæti",
     "An error occurred while trying to update the tags" : "Villa kom upp við að reyna að uppfæra merkin",
     "Added to favorites" : "Bætt í eftirlæti",
     "Removed from favorites" : "Fjarlægt úr eftirlætum",
@@ -121,7 +124,7 @@
     "Show hidden files" : "Sýna faldar skrár",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">nálgast skrárnar þínar með WebDAV</a>",
-    "Uploading @" : "Sendi inn @",
+    "Cancel upload" : "Hætta við innsendingu",
     "No files in here" : "Engar skrár hér",
     "Upload some content or sync with your devices!" : "Sendu inn eitthvað efni eða samstilltu við tækin þín!",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index e4d742f9183..8b92a250be1 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Preferito",
     "New folder" : "Nuova cartella",
     "Upload file" : "Carica file",
+    "Not favorited" : "Non preferito",
+    "Remove from favorites" : "Rimuovi dai preferiti",
+    "Add to favorites" : "Aggiungi ai preferiti",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "Added to favorites" : "Aggiunto ai preferiti",
     "Removed from favorites" : "Rimosso dai preferiti",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Mostra i file nascosti",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>",
-    "Uploading @" : "Caricamento @",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 3a2e5425646..53d0f106fa5 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -75,6 +75,9 @@
     "Favorite" : "Preferito",
     "New folder" : "Nuova cartella",
     "Upload file" : "Carica file",
+    "Not favorited" : "Non preferito",
+    "Remove from favorites" : "Rimuovi dai preferiti",
+    "Add to favorites" : "Aggiungi ai preferiti",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "Added to favorites" : "Aggiunto ai preferiti",
     "Removed from favorites" : "Rimosso dai preferiti",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Mostra i file nascosti",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">accedere ai tuoi file con WebDAV</a>",
-    "Uploading @" : "Caricamento @",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 41c1256e8da..dd4b96aaf3a 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
     "Target folder \"{dir}\" does not exist any more" : "対象フォルダー \"{dir}\" がもう存在しません",
     "Not enough free space" : "十分な空き容量がありません",
-    "Uploading …" : "アップロード中...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中 {loadedSize} ({bitrate})",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 9112fb9bb13..58f16fa2c23 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
     "Target folder \"{dir}\" does not exist any more" : "対象フォルダー \"{dir}\" がもう存在しません",
     "Not enough free space" : "十分な空き容量がありません",
-    "Uploading …" : "アップロード中...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{totalSize} 中 {loadedSize} ({bitrate})",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
index 2395bad8d7b..5910d8e9e52 100644
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Jūs bandote įkelti {size1} dydžio bylą, bet liko tik  {size2} vietos",
     "Target folder \"{dir}\" does not exist any more" : "Paskirties aplanko \"{dir}\" daugiau nebėra",
     "Not enough free space" : "Trūksta laisvos vietos",
-    "Uploading …" : "Įkeliama ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} iš {totalSize} ({bitrate})",
     "Actions" : "Veiksmai",
@@ -118,7 +117,6 @@ OC.L10N.register(
     "Show hidden files" : "Rodyti paslėptus failus",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Naudokite šį adresą  <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> norėdami pasiekti failus per WebDAV</a>",
-    "Uploading @" : "Įkeliama @",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
index d2d320380d1..c8d94929051 100644
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Jūs bandote įkelti {size1} dydžio bylą, bet liko tik  {size2} vietos",
     "Target folder \"{dir}\" does not exist any more" : "Paskirties aplanko \"{dir}\" daugiau nebėra",
     "Not enough free space" : "Trūksta laisvos vietos",
-    "Uploading …" : "Įkeliama ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} iš {totalSize} ({bitrate})",
     "Actions" : "Veiksmai",
@@ -116,7 +115,6 @@
     "Show hidden files" : "Rodyti paslėptus failus",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Naudokite šį adresą  <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> norėdami pasiekti failus per WebDAV</a>",
-    "Uploading @" : "Įkeliama @",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js
index 0363627955f..d37c9e00df4 100644
--- a/apps/files/l10n/nb.js
+++ b/apps/files/l10n/nb.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
     "Target folder \"{dir}\" does not exist any more" : "Målmappen \"{dir}\" finnes ikke lenger",
     "Not enough free space" : "Ikke nok ledig diskplass",
-    "Uploading …" : "Laster opp…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "Actions" : "Handlinger",
@@ -77,6 +76,9 @@ OC.L10N.register(
     "Favorite" : "Gjør til favoritt",
     "New folder" : "Ny mappe",
     "Upload file" : "Last opp fil",
+    "Not favorited" : "Ikke i favoritter",
+    "Remove from favorites" : "Fjern fra favoritter",
+    "Add to favorites" : "Legg til i favoritter",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av merkelappene",
     "Added to favorites" : "Lagt til i favoritter",
     "Removed from favorites" : "Fjernet fra favoritter",
@@ -123,7 +125,6 @@ OC.L10N.register(
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>",
-    "Uploading @" : "Laster opp @",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json
index 239793a7e70..dc1937bd0f5 100644
--- a/apps/files/l10n/nb.json
+++ b/apps/files/l10n/nb.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
     "Target folder \"{dir}\" does not exist any more" : "Målmappen \"{dir}\" finnes ikke lenger",
     "Not enough free space" : "Ikke nok ledig diskplass",
-    "Uploading …" : "Laster opp…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "Actions" : "Handlinger",
@@ -75,6 +74,9 @@
     "Favorite" : "Gjør til favoritt",
     "New folder" : "Ny mappe",
     "Upload file" : "Last opp fil",
+    "Not favorited" : "Ikke i favoritter",
+    "Remove from favorites" : "Fjern fra favoritter",
+    "Add to favorites" : "Legg til i favoritter",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av merkelappene",
     "Added to favorites" : "Lagt til i favoritter",
     "Removed from favorites" : "Fjernet fra favoritter",
@@ -121,7 +123,6 @@
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Bruk adressen <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">for å få tilgang til WebDAV</a>",
-    "Uploading @" : "Laster opp @",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 6bb95a1a00e..5461b88999a 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. Je uploadt {size1}, maar er is slechts {size2} beschikbaar",
     "Target folder \"{dir}\" does not exist any more" : "Doelmap \"{dir}\" bestaat niet meer",
     "Not enough free space" : "Onvoldoende vrije ruimte",
-    "Uploading …" : "Uploaden ...",
+    "Uploading …" : "Uploaden …",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
     "Actions" : "Acties",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favoriet",
     "New folder" : "Nieuwe map",
     "Upload file" : "Bestand uploaden",
+    "Not favorited" : "Niet in favorieten",
+    "Remove from favorites" : "Verwijder van favorieten",
+    "Add to favorites" : "Aan favorieten toevoegen",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij jouw poging om de markeringen bij te werken",
     "Added to favorites" : "Toevoegen aan favorieten",
     "Removed from favorites" : "Verwijderen uit favorieten",
@@ -123,7 +126,7 @@ OC.L10N.register(
     "Show hidden files" : "Verborgen bestanden tonen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om je bestanden via WebDAV te benaderen</a>",
-    "Uploading @" : "Uploaden @",
+    "Cancel upload" : "Stop upload",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload je inhoud of synchroniseer met je apparaten!",
     "No entries found in this folder" : "Niets",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index efda557da81..bf02491b393 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. Je uploadt {size1}, maar er is slechts {size2} beschikbaar",
     "Target folder \"{dir}\" does not exist any more" : "Doelmap \"{dir}\" bestaat niet meer",
     "Not enough free space" : "Onvoldoende vrije ruimte",
-    "Uploading …" : "Uploaden ...",
+    "Uploading …" : "Uploaden …",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
     "Actions" : "Acties",
@@ -75,6 +75,9 @@
     "Favorite" : "Favoriet",
     "New folder" : "Nieuwe map",
     "Upload file" : "Bestand uploaden",
+    "Not favorited" : "Niet in favorieten",
+    "Remove from favorites" : "Verwijder van favorieten",
+    "Add to favorites" : "Aan favorieten toevoegen",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij jouw poging om de markeringen bij te werken",
     "Added to favorites" : "Toevoegen aan favorieten",
     "Removed from favorites" : "Verwijderen uit favorieten",
@@ -121,7 +124,7 @@
     "Show hidden files" : "Verborgen bestanden tonen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">om je bestanden via WebDAV te benaderen</a>",
-    "Uploading @" : "Uploaden @",
+    "Cancel upload" : "Stop upload",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload je inhoud of synchroniseer met je apparaten!",
     "No entries found in this folder" : "Niets",
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index 1d11928c27a..9d298be0e2a 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Ulubione",
     "New folder" : "Nowy folder",
     "Upload file" : "Wyślij plik",
+    "Not favorited" : "Wyłączone z ulubionych",
+    "Remove from favorites" : "Usuń z ulubionych",
+    "Add to favorites" : "Dodaj do ulubionych",
     "An error occurred while trying to update the tags" : "Wystąpił błąd podczas aktualizacji tagów",
     "Added to favorites" : "Dodano do ulubionych",
     "Removed from favorites" : "Usunięto z ulubionych",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Pokaż ukryte pliki",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Użyj tego adresu aby uzyskać <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dostęp do swoich plików poprzez WebDAV</a>",
-    "Uploading @" : "Wysyłanie",
     "Cancel upload" : "Anuluj wysyłanie",
     "No files in here" : "Brak plików",
     "Upload some content or sync with your devices!" : "Wgraj coś, albo wykonaj synchronizację ze swoimi urządzeniami.",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index 91fe2b1c44d..38986e0cd27 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -75,6 +75,9 @@
     "Favorite" : "Ulubione",
     "New folder" : "Nowy folder",
     "Upload file" : "Wyślij plik",
+    "Not favorited" : "Wyłączone z ulubionych",
+    "Remove from favorites" : "Usuń z ulubionych",
+    "Add to favorites" : "Dodaj do ulubionych",
     "An error occurred while trying to update the tags" : "Wystąpił błąd podczas aktualizacji tagów",
     "Added to favorites" : "Dodano do ulubionych",
     "Removed from favorites" : "Usunięto z ulubionych",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Pokaż ukryte pliki",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Użyj tego adresu aby uzyskać <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dostęp do swoich plików poprzez WebDAV</a>",
-    "Uploading @" : "Wysyłanie",
     "Cancel upload" : "Anuluj wysyłanie",
     "No files in here" : "Brak plików",
     "Upload some content or sync with your devices!" : "Wgraj coś, albo wykonaj synchronizację ze swoimi urządzeniami.",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index ab8f1c14afb..ea38f68d6b0 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Favorito",
     "New folder" : "Nova pasta",
     "Upload file" : "Enviar arquivo",
+    "Not favorited" : "Sem favoritos",
+    "Remove from favorites" : "Excluir dos favoritos",
+    "Add to favorites" : "Adicionar aos favoritos",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "Added to favorites" : "Adicionado aos favoritos",
     "Removed from favorites" : "Excluído dos favoritos",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Mostrar arquivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para  acessar seus arquivos via WebDAV</a>",
-    "Uploading @" : "Enviando @",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Envie algum conteúdo ou sincronize com seus dispositivos!",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index c551e03a978..26fafd4c5d8 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -75,6 +75,9 @@
     "Favorite" : "Favorito",
     "New folder" : "Nova pasta",
     "Upload file" : "Enviar arquivo",
+    "Not favorited" : "Sem favoritos",
+    "Remove from favorites" : "Excluir dos favoritos",
+    "Add to favorites" : "Adicionar aos favoritos",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "Added to favorites" : "Adicionado aos favoritos",
     "Removed from favorites" : "Excluído dos favoritos",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Mostrar arquivos ocultos",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para  acessar seus arquivos via WebDAV</a>",
-    "Uploading @" : "Enviando @",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Envie algum conteúdo ou sincronize com seus dispositivos!",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 1455ed2abd3..b56de035d15 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -12,11 +12,11 @@ OC.L10N.register(
     "Favorites" : "Избранные",
     "Could not create folder \"{dir}\"" : "Невозможно создать каталог «{dir}»",
     "Upload cancelled." : "Выгрузка отменена.",
-    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно выгрузить «{filename}», так как это либо каталог, либо файл нулевого размера",
-    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, вы выгружаете {size1}, но только {size2} доступно",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить «{filename}», так как это либо каталог, либо файл нулевого размера",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, вы загружаете {size1}, но только {size2} доступно",
     "Target folder \"{dir}\" does not exist any more" : "Целевой каталог «{dir}» более не существует",
     "Not enough free space" : "Недостаточно свободного места",
-    "Uploading …" : "Выгрузка...",
+    "Uploading …" : "Загрузка...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})",
     "Actions" : "Действия",
@@ -58,7 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} и {files}",
     "_including %n hidden_::_including %n hidden_" : ["включая %n скрытый","включая %n скрытых","включая %n скрытых","включая %n скрытых"],
     "You don’t have permission to upload or create files here" : "У вас нет разрешений на создание или загрузку файлов в эту папку.",
-    "_Uploading %n file_::_Uploading %n files_" : ["Выгружа%nется  файл","Выгружаются %n файла","Выгружаются %n файлов","Выгружаются %n файлов"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Выгружа%nется  файл","Выгружаются %n файла","Выгружаются %n файлов","Загружаются %n файлов"],
     "New" : "Новый",
     "\"{name}\" is an invalid file name." : "«{name}» — недопустимое имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
@@ -76,7 +76,10 @@ OC.L10N.register(
     "Favorited" : "Избранное",
     "Favorite" : "Добавить в избранное",
     "New folder" : "Новый каталог",
-    "Upload file" : "Выгрузить файл",
+    "Upload file" : "Зарузить файл",
+    "Not favorited" : "Не избранное",
+    "Remove from favorites" : "Удалить из избранных",
+    "Add to favorites" : "Добавить в избранное",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "Added to favorites" : "Добавлено в избранное",
     "Removed from favorites" : "Удалено из избранного",
@@ -110,9 +113,9 @@ OC.L10N.register(
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничить уведомления о создании и изменении ваших <strong>избранных файлов</strong> <em>(отображать только в приложении события)</em>",
     "A file or folder has been <strong>restored</strong>" : "Файл или каталог был <strong>восстановлен</strong>",
     "Unlimited" : "Неограничено",
-    "Upload (max. %s)" : "Выгрузка (максимум %s)",
+    "Upload (max. %s)" : "Загрузка (максимум %s)",
     "File handling" : "Управление файлами",
-    "Maximum upload size" : "Максимальный размер выгружаемого файла",
+    "Maximum upload size" : "Максимальный размер загружаемого файла",
     "max. possible: " : "макс. возможно: ",
     "Save" : "Сохранить",
     "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.",
@@ -123,8 +126,7 @@ OC.L10N.register(
     "Show hidden files" : "Показывать скрытые файлы",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа по WebDAV</a>",
-    "Uploading @" : "Выгрузка @",
-    "Cancel upload" : "Отменить выгрузку",
+    "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "В этом каталоге ничего не найдено",
@@ -140,7 +142,7 @@ OC.L10N.register(
     "Deleted files" : "Корзина",
     "Text file" : "Текстовый файл",
     "New text file.txt" : "Новый текстовый файл.txt",
-    "Uploading..." : "Выгрузка...",
+    "Uploading..." : "Загрузка...",
     "..." : "...",
     "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["Остался {hours}:{minutes}:{seconds} час","Осталось {hours}:{minutes}:{seconds} часа","Осталось {hours}:{minutes}:{seconds} часов","Осталось {hours}:{minutes}:{seconds} часов"],
     "{hours}:{minutes}h" : "{hours}:{minutes}ч",
@@ -150,7 +152,7 @@ OC.L10N.register(
     "{seconds}s" : "{seconds}с",
     "Any moment now..." : "В любой момент...",
     "Soon..." : "Скоро...",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Выполняется  передача файла. Покинув страницу, вы прервёте выгрузку.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Выполняется  передача файла. Покинув страницу, вы прервёте загрузку.",
     "Move" : "Перенести",
     "Copy local link" : "Скопировать локальную ссылку",
     "Folder" : "Каталог",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 20bbb1d2e31..53c74b50f6f 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -10,11 +10,11 @@
     "Favorites" : "Избранные",
     "Could not create folder \"{dir}\"" : "Невозможно создать каталог «{dir}»",
     "Upload cancelled." : "Выгрузка отменена.",
-    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно выгрузить «{filename}», так как это либо каталог, либо файл нулевого размера",
-    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, вы выгружаете {size1}, но только {size2} доступно",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить «{filename}», так как это либо каталог, либо файл нулевого размера",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, вы загружаете {size1}, но только {size2} доступно",
     "Target folder \"{dir}\" does not exist any more" : "Целевой каталог «{dir}» более не существует",
     "Not enough free space" : "Недостаточно свободного места",
-    "Uploading …" : "Выгрузка...",
+    "Uploading …" : "Загрузка...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} из {totalSize} ({bitrate})",
     "Actions" : "Действия",
@@ -56,7 +56,7 @@
     "{dirs} and {files}" : "{dirs} и {files}",
     "_including %n hidden_::_including %n hidden_" : ["включая %n скрытый","включая %n скрытых","включая %n скрытых","включая %n скрытых"],
     "You don’t have permission to upload or create files here" : "У вас нет разрешений на создание или загрузку файлов в эту папку.",
-    "_Uploading %n file_::_Uploading %n files_" : ["Выгружа%nется  файл","Выгружаются %n файла","Выгружаются %n файлов","Выгружаются %n файлов"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Выгружа%nется  файл","Выгружаются %n файла","Выгружаются %n файлов","Загружаются %n файлов"],
     "New" : "Новый",
     "\"{name}\" is an invalid file name." : "«{name}» — недопустимое имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
@@ -74,7 +74,10 @@
     "Favorited" : "Избранное",
     "Favorite" : "Добавить в избранное",
     "New folder" : "Новый каталог",
-    "Upload file" : "Выгрузить файл",
+    "Upload file" : "Зарузить файл",
+    "Not favorited" : "Не избранное",
+    "Remove from favorites" : "Удалить из избранных",
+    "Add to favorites" : "Добавить в избранное",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "Added to favorites" : "Добавлено в избранное",
     "Removed from favorites" : "Удалено из избранного",
@@ -108,9 +111,9 @@
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Ограничить уведомления о создании и изменении ваших <strong>избранных файлов</strong> <em>(отображать только в приложении события)</em>",
     "A file or folder has been <strong>restored</strong>" : "Файл или каталог был <strong>восстановлен</strong>",
     "Unlimited" : "Неограничено",
-    "Upload (max. %s)" : "Выгрузка (максимум %s)",
+    "Upload (max. %s)" : "Загрузка (максимум %s)",
     "File handling" : "Управление файлами",
-    "Maximum upload size" : "Максимальный размер выгружаемого файла",
+    "Maximum upload size" : "Максимальный размер загружаемого файла",
     "max. possible: " : "макс. возможно: ",
     "Save" : "Сохранить",
     "With PHP-FPM it might take 5 minutes for changes to be applied." : "В режиме PHP-FPM применение изменений может занять до 5 минут.",
@@ -121,8 +124,7 @@
     "Show hidden files" : "Показывать скрытые файлы",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Используйте этот адрес <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">для доступа по WebDAV</a>",
-    "Uploading @" : "Выгрузка @",
-    "Cancel upload" : "Отменить выгрузку",
+    "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "В этом каталоге ничего не найдено",
@@ -138,7 +140,7 @@
     "Deleted files" : "Корзина",
     "Text file" : "Текстовый файл",
     "New text file.txt" : "Новый текстовый файл.txt",
-    "Uploading..." : "Выгрузка...",
+    "Uploading..." : "Загрузка...",
     "..." : "...",
     "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["Остался {hours}:{minutes}:{seconds} час","Осталось {hours}:{minutes}:{seconds} часа","Осталось {hours}:{minutes}:{seconds} часов","Осталось {hours}:{minutes}:{seconds} часов"],
     "{hours}:{minutes}h" : "{hours}:{minutes}ч",
@@ -148,7 +150,7 @@
     "{seconds}s" : "{seconds}с",
     "Any moment now..." : "В любой момент...",
     "Soon..." : "Скоро...",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Выполняется  передача файла. Покинув страницу, вы прервёте выгрузку.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Выполняется  передача файла. Покинув страницу, вы прервёте загрузку.",
     "Move" : "Перенести",
     "Copy local link" : "Скопировать локальную ссылку",
     "Folder" : "Каталог",
diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js
index 79e74f8fc37..b103172e819 100644
--- a/apps/files/l10n/sk.js
+++ b/apps/files/l10n/sk.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Cieľový priečinok \"{dir}\" už neexistuje",
     "Not enough free space" : "Nedostatok voľného miesta",
-    "Uploading …" : "Nahráva sa ...",
+    "Uploading …" : "Nahrávanie...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "Actions" : "Akcie",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Obľúbené",
     "New folder" : "Nový priečinok",
     "Upload file" : "Nahrať súbor",
+    "Not favorited" : "Nie je obľúbený",
+    "Remove from favorites" : "Odstrániť z obľúbených",
+    "Add to favorites" : "Pridať do obľúbených",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "Added to favorites" : "Pridané do obľúbených",
     "Removed from favorites" : "Odstránené z obľúbených",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Zobraziť skryté súbory",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použi túto adresu pre <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">prístup ku svojím súborom cez WebDAV</a>",
-    "Uploading @" : "Nahráva sa @",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json
index 3abaef4aa98..5947e0b1dca 100644
--- a/apps/files/l10n/sk.json
+++ b/apps/files/l10n/sk.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Cieľový priečinok \"{dir}\" už neexistuje",
     "Not enough free space" : "Nedostatok voľného miesta",
-    "Uploading …" : "Nahráva sa ...",
+    "Uploading …" : "Nahrávanie...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
     "Actions" : "Akcie",
@@ -75,6 +75,9 @@
     "Favorite" : "Obľúbené",
     "New folder" : "Nový priečinok",
     "Upload file" : "Nahrať súbor",
+    "Not favorited" : "Nie je obľúbený",
+    "Remove from favorites" : "Odstrániť z obľúbených",
+    "Add to favorites" : "Pridať do obľúbených",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "Added to favorites" : "Pridané do obľúbených",
     "Removed from favorites" : "Odstránené z obľúbených",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Zobraziť skryté súbory",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Použi túto adresu pre <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">prístup ku svojím súborom cez WebDAV</a>",
-    "Uploading @" : "Nahráva sa @",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index cedf0bfc2b5..28a97a6cdb3 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
     "Target folder \"{dir}\" does not exist any more" : "Ciljna mapa \"{dir}\" ne obstaja več",
     "Not enough free space" : "Ni dovolj prostora",
-    "Uploading …" : "Nalaganje",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})",
     "Actions" : "Dejanja",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "Show hidden files" : "Pokaži skrite datoteke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.",
-    "Uploading @" : "Nalaganje @",
     "Cancel upload" : "Prekini nalaganje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index a10d6ac1d91..c5dd2eb6e29 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
     "Target folder \"{dir}\" does not exist any more" : "Ciljna mapa \"{dir}\" ne obstaja več",
     "Not enough free space" : "Ni dovolj prostora",
-    "Uploading …" : "Nalaganje",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} od {totalSize} ({bitrate})",
     "Actions" : "Dejanja",
@@ -117,7 +116,6 @@
     "Show hidden files" : "Pokaži skrite datoteke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.",
-    "Uploading @" : "Nalaganje @",
     "Cancel upload" : "Prekini nalaganje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index 1a3b01420f9..62d72d56d45 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало",
     "Target folder \"{dir}\" does not exist any more" : "Одредишна фасцикла \"{dir}\" више не постоји",
     "Not enough free space" : "Нема довољно слободног места",
-    "Uploading …" : "Отпремам …",
+    "Uploading …" : "Отпремам…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} од {totalSize} ({bitrate})",
     "Actions" : "Радње",
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Омиљени",
     "New folder" : "Нова фасцикла",
     "Upload file" : "Отпреми фајл",
+    "Not favorited" : "Није омиљено",
+    "Remove from favorites" : "Избаци из омиљених",
+    "Add to favorites" : "Додај у омиљене",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "Added to favorites" : "Додато у омиљено",
     "Removed from favorites" : "Избачено из омиљених",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Прикажи скривене фајлове",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Користи ову адресу да <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">приступате Вашим фајловима преко ВебДАВа</a>",
-    "Uploading @" : "Отпремам @",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index c8db7af7ab8..190e3045496 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -14,7 +14,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало",
     "Target folder \"{dir}\" does not exist any more" : "Одредишна фасцикла \"{dir}\" више не постоји",
     "Not enough free space" : "Нема довољно слободног места",
-    "Uploading …" : "Отпремам …",
+    "Uploading …" : "Отпремам…",
     "…" : "…",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} од {totalSize} ({bitrate})",
     "Actions" : "Радње",
@@ -75,6 +75,9 @@
     "Favorite" : "Омиљени",
     "New folder" : "Нова фасцикла",
     "Upload file" : "Отпреми фајл",
+    "Not favorited" : "Није омиљено",
+    "Remove from favorites" : "Избаци из омиљених",
+    "Add to favorites" : "Додај у омиљене",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "Added to favorites" : "Додато у омиљено",
     "Removed from favorites" : "Избачено из омиљених",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Прикажи скривене фајлове",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Користи ову адресу да <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">приступате Вашим фајловима преко ВебДАВа</a>",
-    "Uploading @" : "Отпремам @",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index ef6e091ecc7..43515856b89 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
     "Target folder \"{dir}\" does not exist any more" : "Målmapp \"{dir}\" existerar inte mer",
     "Not enough free space" : "Inte tillräckligt med ledigt utrymme",
-    "Uploading …" : "Laddar upp ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "Actions" : "Åtgärder",
@@ -123,7 +122,6 @@ OC.L10N.register(
     "Show hidden files" : "Visa dolda filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>",
-    "Uploading @" : "Laddar upp @",
     "Cancel upload" : "Avbryt uppladdning",
     "No files in here" : "Inga filer kunde hittas",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index 88b6d108dcb..a3cc329f71b 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
     "Target folder \"{dir}\" does not exist any more" : "Målmapp \"{dir}\" existerar inte mer",
     "Not enough free space" : "Inte tillräckligt med ledigt utrymme",
-    "Uploading …" : "Laddar upp ...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} av {totalSize} ({bitrate})",
     "Actions" : "Åtgärder",
@@ -121,7 +120,6 @@
     "Show hidden files" : "Visa dolda filer",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Använd den här adressen för att <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">komma åt dina filer via WebDAV</a>",
-    "Uploading @" : "Laddar upp @",
     "Cancel upload" : "Avbryt uppladdning",
     "No files in here" : "Inga filer kunde hittas",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index d5ee46c53b8..b7116cbbd8b 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -77,6 +77,9 @@ OC.L10N.register(
     "Favorite" : "Sık kullanılanlara ekle",
     "New folder" : "Yeni klasör",
     "Upload file" : "Dosya yükle",
+    "Not favorited" : "Sık kullanılanlarda değil",
+    "Remove from favorites" : "Sık kullanılanlardan kaldır",
+    "Add to favorites" : "Sık kullanılanlara ekle",
     "An error occurred while trying to update the tags" : "Etiketler güncellenirken bir sorun çıktı",
     "Added to favorites" : "Sık kullanılanlara eklendi",
     "Removed from favorites" : "Sık kullanılanlardan çıkarıldı",
@@ -123,7 +126,6 @@ OC.L10N.register(
     "Show hidden files" : "Gizli dosyaları görüntüle",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV üzerinden erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>",
-    "Uploading @" : "Yükleniyor @",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada herhangi bir dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin ya da aygıtlarınızla eşitleyin!",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index b63f114f80a..efd609da063 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -75,6 +75,9 @@
     "Favorite" : "Sık kullanılanlara ekle",
     "New folder" : "Yeni klasör",
     "Upload file" : "Dosya yükle",
+    "Not favorited" : "Sık kullanılanlarda değil",
+    "Remove from favorites" : "Sık kullanılanlardan kaldır",
+    "Add to favorites" : "Sık kullanılanlara ekle",
     "An error occurred while trying to update the tags" : "Etiketler güncellenirken bir sorun çıktı",
     "Added to favorites" : "Sık kullanılanlara eklendi",
     "Removed from favorites" : "Sık kullanılanlardan çıkarıldı",
@@ -121,7 +124,6 @@
     "Show hidden files" : "Gizli dosyaları görüntüle",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Dosyalarınıza WebDAV üzerinden erişmek için <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">bu adresi kullanın</a>",
-    "Uploading @" : "Yükleniyor @",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada herhangi bir dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin ya da aygıtlarınızla eşitleyin!",
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index a24c058ce53..451f6adfe65 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Теки призначення \"{dir}\" більше не існує.",
     "Not enough free space" : "Недостатньо вільного місця",
-    "Uploading …" : "Вивантаження...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} з {totalSize} ({bitrate})",
     "Actions" : "Дії",
@@ -118,7 +117,6 @@ OC.L10N.register(
     "Show hidden files" : "Показати приховані файли",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Використайте цю адресу для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">доступу через WebDAV</a>",
-    "Uploading @" : "Вивантаження @",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index dd4b04e1e73..1d14e89de2d 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}",
     "Target folder \"{dir}\" does not exist any more" : "Теки призначення \"{dir}\" більше не існує.",
     "Not enough free space" : "Недостатньо вільного місця",
-    "Uploading …" : "Вивантаження...",
     "…" : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} з {totalSize} ({bitrate})",
     "Actions" : "Дії",
@@ -116,7 +115,6 @@
     "Show hidden files" : "Показати приховані файли",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Використайте цю адресу для <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">доступу через WebDAV</a>",
-    "Uploading @" : "Вивантаження @",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
index 34c9c79b5a7..426c52d3d8b 100644
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống",
     "Target folder \"{dir}\" does not exist any more" : "Thư mục đích \"{dir}\" không còn tồn tại",
     "Not enough free space" : "Không đủ dung lượng trống",
-    "Uploading …" : "Đang tải lên …",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} trong tổng số {totalSize} ({bitrate})",
     "Actions" : "Actions",
     "Download" : "Tải về",
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
index 5bf200eb0a0..09e81edb376 100644
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Không đủ dung lượng trống, bạn đang tải {size1} nhưng chỉ còn {size2} trống",
     "Target folder \"{dir}\" does not exist any more" : "Thư mục đích \"{dir}\" không còn tồn tại",
     "Not enough free space" : "Không đủ dung lượng trống",
-    "Uploading …" : "Đang tải lên …",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} trong tổng số {totalSize} ({bitrate})",
     "Actions" : "Actions",
     "Download" : "Tải về",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 97be741304e..3efe7b5443c 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -16,7 +16,6 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空间不足，您上传的文件大小为 {size1} ，但可用空间仅剩 {size2}",
     "Target folder \"{dir}\" does not exist any more" : "目标目录 \"{dir}\" 不存在",
     "Not enough free space" : "可用空间不足",
-    "Uploading …" : "正在上传...",
     "…" : "undefined",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "Actions" : "操作",
@@ -123,7 +122,6 @@ OC.L10N.register(
     "Show hidden files" : "显示隐藏文件",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">通过 WebDAV 访问您的文件</a>",
-    "Uploading @" : "上传中",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传或从您的设备中同步!",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index b8630ae0b1e..185635f9a51 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -14,7 +14,6 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空间不足，您上传的文件大小为 {size1} ，但可用空间仅剩 {size2}",
     "Target folder \"{dir}\" does not exist any more" : "目标目录 \"{dir}\" 不存在",
     "Not enough free space" : "可用空间不足",
-    "Uploading …" : "正在上传...",
     "…" : "undefined",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
     "Actions" : "操作",
@@ -121,7 +120,6 @@
     "Show hidden files" : "显示隐藏文件",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">通过 WebDAV 访问您的文件</a>",
-    "Uploading @" : "上传中",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传或从您的设备中同步!",
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 154fa2ca816..d6051f1307f 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Actions" : "動作",
     "Download" : "下載",
     "Rename" : "重新命名",
+    "Move or copy" : "移動或複製",
     "Target folder" : "目標資料夾",
     "Delete" : "刪除",
     "Disconnect storage" : "斷開儲存空間連接",
@@ -36,6 +37,8 @@ OC.L10N.register(
     "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
     "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在",
     "Could not move \"{file}\"" : "無法移動 \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "無法複製\"{file}\"，目標已存在",
+    "Could not copy \"{file}\"" : "無法複製\"{file}\"",
     "{newName} already exists" : "{newName} 已經存在",
     "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱",
@@ -72,9 +75,12 @@ OC.L10N.register(
     "Favorite" : "我的最愛",
     "New folder" : "新資料夾",
     "Upload file" : "上傳檔案",
+    "Not favorited" : "未加入至最愛",
+    "Remove from favorites" : "從最愛中移除",
+    "Add to favorites" : "添加到最愛",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
-    "Added to favorites" : "添加到最愛",
-    "Removed from favorites" : "從最愛移除",
+    "Added to favorites" : "已添加到最愛",
+    "Removed from favorites" : "已從最愛中移除",
     "You added {file} to your favorites" : "你已添加 {file} 至最愛",
     "You removed {file} from your favorites" : "你已移除 {file} 從最愛",
     "File changes" : "檔案更動",
@@ -118,7 +124,7 @@ OC.L10N.register(
     "Show hidden files" : "顯示隱藏檔",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>",
-    "Uploading @" : "正在上傳 @",
+    "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 13502ecc950..45cfeb15b6f 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -20,6 +20,7 @@
     "Actions" : "動作",
     "Download" : "下載",
     "Rename" : "重新命名",
+    "Move or copy" : "移動或複製",
     "Target folder" : "目標資料夾",
     "Delete" : "刪除",
     "Disconnect storage" : "斷開儲存空間連接",
@@ -34,6 +35,8 @@
     "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
     "Could not move \"{file}\", target exists" : "無法移動 \"{file}\"，目標已經存在",
     "Could not move \"{file}\"" : "無法移動 \"{file}\"",
+    "Could not copy \"{file}\", target exists" : "無法複製\"{file}\"，目標已存在",
+    "Could not copy \"{file}\"" : "無法複製\"{file}\"",
     "{newName} already exists" : "{newName} 已經存在",
     "Could not rename \"{fileName}\", it does not exist any more" : "無法命名檔案 \"{fileName}\"，因為此檔案已經不存在",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "此名稱 \"{targetName}\" 在這資料夾 \"{dir}\" 已經被使用。請重新選擇不同的名稱",
@@ -70,9 +73,12 @@
     "Favorite" : "我的最愛",
     "New folder" : "新資料夾",
     "Upload file" : "上傳檔案",
+    "Not favorited" : "未加入至最愛",
+    "Remove from favorites" : "從最愛中移除",
+    "Add to favorites" : "添加到最愛",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
-    "Added to favorites" : "添加到最愛",
-    "Removed from favorites" : "從最愛移除",
+    "Added to favorites" : "已添加到最愛",
+    "Removed from favorites" : "已從最愛中移除",
     "You added {file} to your favorites" : "你已添加 {file} 至最愛",
     "You removed {file} from your favorites" : "你已移除 {file} 從最愛",
     "File changes" : "檔案更動",
@@ -116,7 +122,7 @@
     "Show hidden files" : "顯示隱藏檔",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "使用這個位址來<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">使用 WebDAV 存取檔案</a>",
-    "Uploading @" : "正在上傳 @",
+    "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 46bd9351e39..92f64a52a28 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -2,7 +2,7 @@
 		<div class="actions creatable hidden">
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar">
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading @'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading …'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
 				</div>
 				<button class="stop icon-close" style="display:none">
 					<span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span>
@@ -41,12 +41,14 @@
 <table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="32" data-preview-y="32">
 	<thead>
 		<tr>
+			<th id="headerSelection" class="hidden column-selection">
+				<input type="checkbox" id="select_all_files" class="select-all checkbox"/>
+				<label for="select_all_files">
+					<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
+				</label>
+			</th>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<input type="checkbox" id="select_all_files" class="select-all checkbox"/>
-					<label for="select_all_files">
-						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
-					</label>
 					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
 					<span id="selectedActionsList" class="selectedActions">
 						<a href="" class="copy-move">
diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
index 32c8d628a80..8c48b9feca7 100644
--- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php
+++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php
@@ -27,6 +27,8 @@ namespace OCA\Files\Tests\Command;
 use OC\Files\View;
 use OCA\Files\Command\DeleteOrphanedFiles;
 use OCP\Files\StorageNotAvailableException;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Test\TestCase;
 
 /**
@@ -87,10 +89,10 @@ class DeleteOrphanedFilesTest extends TestCase {
 	 * Test clearing orphaned files
 	 */
 	public function testClearFiles() {
-		$input = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+		$input = $this->getMockBuilder(InputInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+		$output = $this->getMockBuilder(OutputInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 007335b948d..3d8c8164abb 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -27,6 +27,8 @@ namespace OCA\Files\Tests\Controller;
 
 use OCA\Files\Controller\ViewController;
 use OCP\AppFramework\Http;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IUser;
 use OCP\Template;
@@ -68,14 +70,14 @@ class ViewControllerTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
-		$this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')->getMock();
-		$this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
-		$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
+		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
+		$this->urlGenerator = $this->getMockBuilder(IURLGenerator::class)->getMock();
+		$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
+		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
 		$this->eventDispatcher = $this->getMockBuilder('\Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
-		$this->userSession = $this->getMockBuilder('\OCP\IUserSession')->getMock();
+		$this->userSession = $this->getMockBuilder(IUserSession::class)->getMock();
 		$this->appManager = $this->getMockBuilder('\OCP\App\IAppManager')->getMock();
-		$this->user = $this->getMockBuilder('\OCP\IUser')->getMock();
+		$this->user = $this->getMockBuilder(IUser::class)->getMock();
 		$this->user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('testuser1'));
@@ -281,12 +283,12 @@ class ViewControllerTest extends TestCase {
 	}
 
 	public function testShowFileRouteWithFolder() {
-		$node = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$node = $this->getMockBuilder(Folder::class)->getMock();
 		$node->expects($this->once())
 			->method('getPath')
 			->will($this->returnValue('/testuser1/files/test/sub'));
 
-		$baseFolder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$baseFolder = $this->getMockBuilder(Folder::class)->getMock();
 
 		$this->rootFolder->expects($this->once())
 			->method('getUserFolder')
@@ -313,19 +315,19 @@ class ViewControllerTest extends TestCase {
 	}
 
 	public function testShowFileRouteWithFile() {
-		$parentNode = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$parentNode = $this->getMockBuilder(Folder::class)->getMock();
 		$parentNode->expects($this->once())
 			->method('getPath')
 			->will($this->returnValue('testuser1/files/test'));
 
-		$baseFolder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$baseFolder = $this->getMockBuilder(Folder::class)->getMock();
 
 		$this->rootFolder->expects($this->once())
 			->method('getUserFolder')
 			->with('testuser1')
 			->will($this->returnValue($baseFolder));
 
-		$node = $this->getMockBuilder('\OCP\Files\File')->getMock();
+		$node = $this->getMockBuilder(File::class)->getMock();
 		$node->expects($this->once())
 			->method('getParent')
 			->will($this->returnValue($parentNode));
@@ -353,7 +355,7 @@ class ViewControllerTest extends TestCase {
 	}
 
 	public function testShowFileRouteWithInvalidFileId() {
-		$baseFolder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$baseFolder = $this->getMockBuilder(Folder::class)->getMock();
 		$this->rootFolder->expects($this->once())
 			->method('getUserFolder')
 			->with('testuser1')
@@ -380,13 +382,13 @@ class ViewControllerTest extends TestCase {
 			->with('files_trashbin')
 			->will($this->returnValue(true));
 
-		$parentNode = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$parentNode = $this->getMockBuilder(Folder::class)->getMock();
 		$parentNode->expects($this->once())
 			->method('getPath')
 			->will($this->returnValue('testuser1/files_trashbin/files/test.d1462861890/sub'));
 
-		$baseFolderFiles = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
-		$baseFolderTrash = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
+		$baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
+		$baseFolderTrash = $this->getMockBuilder(Folder::class)->getMock();
 
 		$this->rootFolder->expects($this->at(0))
 			->method('getUserFolder')
@@ -402,7 +404,7 @@ class ViewControllerTest extends TestCase {
 			->with(123)
 			->will($this->returnValue([]));
 
-		$node = $this->getMockBuilder('\OCP\Files\File')->getMock();
+		$node = $this->getMockBuilder(File::class)->getMock();
 		$node->expects($this->once())
 			->method('getParent')
 			->will($this->returnValue($parentNode));
diff --git a/apps/files/tests/Settings/AdminTest.php b/apps/files/tests/Settings/AdminTest.php
index 1ab8a992879..1bcfd111db5 100644
--- a/apps/files/tests/Settings/AdminTest.php
+++ b/apps/files/tests/Settings/AdminTest.php
@@ -41,7 +41,7 @@ class AdminTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 		$this->iniGetWrapper = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper')->disableOriginalConstructor()->getMock();
-		$this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
+		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
 		$this->admin = new Admin(
 			$this->iniGetWrapper,
 			$this->request
diff --git a/apps/files/tests/js/fileactionsmenuSpec.js b/apps/files/tests/js/fileactionsmenuSpec.js
index 3028db2b3ac..926516b3043 100644
--- a/apps/files/tests/js/fileactionsmenuSpec.js
+++ b/apps/files/tests/js/fileactionsmenuSpec.js
@@ -205,6 +205,34 @@ describe('OCA.Files.FileActionsMenu tests', function() {
 			expect(displayNameStub.calledWith(menuContext)).toEqual(true);
 			expect(menu.$el.find('a[data-action=Something]').text()).toEqual('Test');
 		});
+		it('uses plain iconClass', function() {
+			fileActions.registerAction({
+				name: 'Something',
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL,
+				iconClass: 'test'
+			});
+
+			menu.render();
+
+			expect(menu.$el.find('a[data-action=Something]').children('span.icon').hasClass('test')).toEqual(true);
+		});
+		it('calls iconClass function', function() {
+			var iconClassStub = sinon.stub().returns('test');
+
+			fileActions.registerAction({
+				name: 'Something',
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL,
+				iconClass: iconClassStub
+			});
+
+			menu.render();
+
+			expect(iconClassStub.calledOnce).toEqual(true);
+			expect(iconClassStub.calledWith(menuContext.$file.attr('data-file'), menuContext)).toEqual(true);
+			expect(menu.$el.find('a[data-action=Something]').children('span.icon').hasClass('test')).toEqual(true);
+		});
 	});
 
 	describe('action handler', function() {
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 836a5e5ce71..8bb188e3602 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -712,8 +712,14 @@ describe('OCA.Files.FileList tests', function() {
 				fileList.add(testFiles[i], {silent: true});
 			}
 
+			$tr = fileList.findFileEl('One.txt');
+			expect($tr.find('a.name').css('display')).not.toEqual('none');
+
 			// trigger rename prompt
 			fileList.rename('One.txt');
+
+			expect($tr.find('a.name').css('display')).toEqual('none');
+
 			$input = fileList.$fileList.find('input.filename');
 			$input.val('Two.jpg');
 
@@ -735,12 +741,12 @@ describe('OCA.Files.FileList tests', function() {
 			$tr = fileList.findFileEl('One.txt');
 			expect($tr.length).toEqual(1);
 			expect($tr.find('a .nametext').text().trim()).toEqual('One.txt');
-			expect($tr.find('a.name').is(':visible')).toEqual(true);
+			expect($tr.find('a.name').css('display')).not.toEqual('none');
 
 			$tr = fileList.findFileEl('Two.jpg');
 			expect($tr.length).toEqual(1);
 			expect($tr.find('a .nametext').text().trim()).toEqual('Two.jpg');
-			expect($tr.find('a.name').is(':visible')).toEqual(true);
+			expect($tr.find('a.name').css('display')).not.toEqual('none');
 
 			// input and form are gone
 			expect(fileList.$fileList.find('input.filename').length).toEqual(0);
@@ -750,7 +756,7 @@ describe('OCA.Files.FileList tests', function() {
 			doRename();
 
 			expect(fileList.findFileEl('Tu_after_three.txt').find('.thumbnail').parent().attr('class'))
-				.toEqual('icon-loading-small');
+				.toContain('icon-loading-small');
 
 			deferredRename.reject(409);
 
@@ -838,7 +844,7 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.move('One.txt', '/somedir');
 
 			expect(fileList.findFileEl('One.txt').find('.thumbnail').parent().attr('class'))
-				.toEqual('icon-loading-small');
+				.toContain('icon-loading-small');
 
 			expect(moveStub.calledOnce).toEqual(true);
 
@@ -935,7 +941,7 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.copy('One.txt', '/somedir');
 
 			expect(fileList.findFileEl('One.txt').find('.thumbnail').parent().attr('class'))
-				.toEqual('icon-loading-small');
+				.toContain('icon-loading-small');
 
 			expect(copyStub.calledOnce).toEqual(true);
 
@@ -1621,7 +1627,9 @@ describe('OCA.Files.FileList tests', function() {
 			var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
 			fileList.changeDirectory('/anothersubdir');
 			deferredList.resolve(200, [testRoot].concat(testFiles));
-			expect(fileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+			// twice because setDirectory gets called by _setCurrentDir which
+			// gets called directly by changeDirectory and via reload()
+			expect(fileList.breadcrumb.setDirectory.calledTwice).toEqual(true);
 			expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
 			setDirSpy.restore();
 			getFolderContentsStub.restore();
@@ -1741,7 +1749,7 @@ describe('OCA.Files.FileList tests', function() {
 		it('Selects a file when clicking its checkbox', function() {
 			var $tr = fileList.findFileEl('One.txt');
 			expect($tr.find('input:checkbox').prop('checked')).toEqual(false);
-			$tr.find('td.filename input:checkbox').click();
+			$tr.find('td.selection input:checkbox').click();
 
 			expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
 		});
@@ -1779,7 +1787,7 @@ describe('OCA.Files.FileList tests', function() {
 			var $tr = fileList.findFileEl('One.txt');
 			var $tr2 = fileList.findFileEl('Three.pdf');
 			var e;
-			$tr.find('td.filename input:checkbox').click();
+			$tr.find('td.selection input:checkbox').click();
 			e = new $.Event('click');
 			e.shiftKey = true;
 			$tr2.find('td.filename .name').trigger(e);
@@ -1797,7 +1805,7 @@ describe('OCA.Files.FileList tests', function() {
 			var $tr = fileList.findFileEl('One.txt');
 			var $tr2 = fileList.findFileEl('Three.pdf');
 			var e;
-			$tr2.find('td.filename input:checkbox').click();
+			$tr2.find('td.selection input:checkbox').click();
 			e = new $.Event('click');
 			e.shiftKey = true;
 			$tr.find('td.filename .name').trigger(e);
@@ -1813,13 +1821,13 @@ describe('OCA.Files.FileList tests', function() {
 		});
 		it('Selecting all files will automatically check "select all" checkbox', function() {
 			expect($('.select-all').prop('checked')).toEqual(false);
-			$('#fileList tr td.filename input:checkbox').click();
+			$('#fileList tr td.selection input:checkbox').click();
 			expect($('.select-all').prop('checked')).toEqual(true);
 		});
 		it('Selecting all files on the first visible page will not automatically check "select all" checkbox', function() {
 			fileList.setFiles(generateFiles(0, 41));
 			expect($('.select-all').prop('checked')).toEqual(false);
-			$('#fileList tr td.filename input:checkbox').click();
+			$('#fileList tr td.selection input:checkbox').click();
 			expect($('.select-all').prop('checked')).toEqual(false);
 		});
 		it('Selecting all files also selects hidden files when invisible', function() {
@@ -1831,7 +1839,7 @@ describe('OCA.Files.FileList tests', function() {
 				size: 150
 			}));
 			$('.select-all').click();
-			expect($tr.find('td.filename input:checkbox').prop('checked')).toEqual(true);
+			expect($tr.find('td.selection input:checkbox').prop('checked')).toEqual(true);
 			expect(_.pluck(fileList.getSelectedFiles(), 'name')).toContain('.hidden');
 		});
 		it('Clicking "select all" will select/deselect all files', function() {
@@ -3150,7 +3158,7 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.showFileBusyState('Two.jpg', true);
 			expect($tr.hasClass('busy')).toEqual(true);
 			expect($tr.find('.thumbnail').parent().attr('class'))
-				.toEqual('icon-loading-small');
+				.toContain('icon-loading-small');
 
 
 			fileList.showFileBusyState('Two.jpg', false);
diff --git a/apps/files/tests/js/tagspluginspec.js b/apps/files/tests/js/tagspluginspec.js
index a4efc08aa53..363a8bb0e19 100644
--- a/apps/files/tests/js/tagspluginspec.js
+++ b/apps/files/tests/js/tagspluginspec.js
@@ -49,39 +49,39 @@ describe('OCA.Files.TagsPlugin tests', function() {
 
 	describe('Favorites icon', function() {
 		it('renders favorite icon and extra data', function() {
-			var $action, $tr;
+			var $favoriteMark, $tr;
 			fileList.setFiles(testFiles);
 			$tr = fileList.$el.find('tbody tr:first');
-			$action = $tr.find('.action-favorite');
-			expect($action.length).toEqual(1);
-			expect($action.hasClass('permanent')).toEqual(false);
+			$favoriteMark = $tr.find('.favorite-mark');
+			expect($favoriteMark.length).toEqual(1);
+			expect($favoriteMark.hasClass('permanent')).toEqual(false);
 
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2']);
 			expect($tr.attr('data-favorite')).not.toBeDefined();
 		});
 		it('renders permanent favorite icon and extra data', function() {
-			var $action, $tr;
+			var $favoriteMark, $tr;
 			testFiles[0].tags.push(OC.TAG_FAVORITE);
 			fileList.setFiles(testFiles);
 			$tr = fileList.$el.find('tbody tr:first');
-			$action = $tr.find('.action-favorite');
-			expect($action.length).toEqual(1);
-			expect($action.hasClass('permanent')).toEqual(true);
+			$favoriteMark = $tr.find('.favorite-mark');
+			expect($favoriteMark.length).toEqual(1);
+			expect($favoriteMark.hasClass('permanent')).toEqual(true);
 
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', OC.TAG_FAVORITE]);
 			expect($tr.attr('data-favorite')).toEqual('true');
 		});
-		it('adds has-favorites class on table', function() {
-			expect(fileList.$el.hasClass('has-favorites')).toEqual(true);
-		});
 	});
 	describe('Applying tags', function() {
-		it('sends request to server and updates icon', function() {
+		it('through FileActionsMenu sends request to server and updates icon', function() {
 			var request;
 			fileList.setFiles(testFiles);
 			var $tr = fileList.findFileEl('One.txt');
-			var $action = $tr.find('.action-favorite');
-			$action.click();
+			var $favoriteMark = $tr.find('.favorite-mark');
+			var $showMenuAction = $tr.find('.action-menu');
+			$showMenuAction.click();
+			var $favoriteActionInMenu = $tr.find('.fileActionsMenu .action-favorite');
+			$favoriteActionInMenu.click();
 
 			expect(fakeServer.requests.length).toEqual(1);
 			request = fakeServer.requests[0];
@@ -94,15 +94,21 @@ describe('OCA.Files.TagsPlugin tests', function() {
 
 			// re-read the element as it was re-inserted
 			$tr = fileList.findFileEl('One.txt');
-			$action = $tr.find('.action-favorite');
+			$favoriteMark = $tr.find('.favorite-mark');
+			$showMenuAction = $tr.find('.action-menu');
 
 			expect($tr.attr('data-favorite')).toEqual('true');
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
-			expect($action.find('.icon').hasClass('icon-star')).toEqual(false);
-			expect($action.find('.icon').hasClass('icon-starred')).toEqual(true);
+			expect($favoriteMark.find('.icon').hasClass('icon-star')).toEqual(false);
+			expect($favoriteMark.find('.icon').hasClass('icon-starred')).toEqual(true);
 
-			$action.click();
+			// show again the menu and get the new action, as the menu was
+			// closed and removed (and with it, the previous action) when that
+			// action was clicked
+			$showMenuAction.click();
+			$favoriteActionInMenu = $tr.find('.fileActionsMenu .action-favorite');
+			$favoriteActionInMenu.click();
 
 			expect(fakeServer.requests.length).toEqual(2);
 			request = fakeServer.requests[1];
@@ -115,13 +121,13 @@ describe('OCA.Files.TagsPlugin tests', function() {
 
 			// re-read the element as it was re-inserted
 			$tr = fileList.findFileEl('One.txt');
-			$action = $tr.find('.action-favorite');
+			$favoriteMark = $tr.find('.favorite-mark');
 
 			expect($tr.attr('data-favorite')).toBeFalsy();
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3']);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3']);
-			expect($action.find('.icon').hasClass('icon-star')).toEqual(true);
-			expect($action.find('.icon').hasClass('icon-starred')).toEqual(false);
+			expect($favoriteMark.find('.icon').hasClass('icon-star')).toEqual(true);
+			expect($favoriteMark.find('.icon').hasClass('icon-starred')).toEqual(false);
 		});
 	});
 	describe('elementToFile', function() {