187 files changed, 939 insertions, 695 deletions

diff --git a/lib/base.php b/lib/base.php
index 818e13fbef2..8ea164a5007 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -337,27 +337,49 @@ class OC {
 	 */
 	private static function printUpgradePage() {
 		$systemConfig = \OC::$server->getSystemConfig();
+
+		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+		$tooBig = false;
+		if (!$disableWebUpdater) {
+			// count users
+			$stats = \OC::$server->getUserManager()->countUsers();
+			$totalUsers = array_sum($stats);
+			$tooBig = ($totalUsers > 50);
+		}
+		if ($disableWebUpdater || $tooBig) {
+			// send http status 503
+			header('HTTP/1.1 503 Service Temporarily Unavailable');
+			header('Status: 503 Service Temporarily Unavailable');
+			header('Retry-After: 120');
+
+			// render error page
+			$template = new OC_Template('', 'update.use-cli', 'guest');
+			$template->assign('productName', 'ownCloud'); // for now
+			$template->assign('version', OC_Util::getVersionString());
+			$template->assign('tooBig', $tooBig);
+
+			$template->printPage();
+			die();
+		}
+
+		// check whether this is a core update or apps update
+		$installedVersion = $systemConfig->getValue('version', '0.0.0');
+		$currentVersion = implode('.', \OCP\Util::getVersion());
+
+		// if not a core upgrade, then it's apps upgrade
+		$isAppsOnlyUpgrade = (version_compare($currentVersion, $installedVersion, '='));
+
 		$oldTheme = $systemConfig->getValue('theme');
 		$systemConfig->setValue('theme', '');
 		\OCP\Util::addScript('config'); // needed for web root
 		\OCP\Util::addScript('update');
 		\OCP\Util::addStyle('update');
 
-		// check whether this is a core update or apps update
-		$installedVersion = $systemConfig->getValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
 		$appManager = \OC::$server->getAppManager();
 
 		$tmpl = new OC_Template('', 'update.admin', 'guest');
 		$tmpl->assign('version', OC_Util::getVersionString());
-
-		// if not a core upgrade, then it's apps upgrade
-		if (version_compare($currentVersion, $installedVersion, '=')) {
-			$tmpl->assign('isAppsOnlyUpgrade', true);
-		} else {
-			$tmpl->assign('isAppsOnlyUpgrade', false);
-		}
+		$tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
 
 		// get third party apps
 		$ocVersion = \OCP\Util::getVersion();
@@ -423,7 +445,7 @@ class OC {
 	}
 
 	public static function loadAppClassPaths() {
-		foreach (OC_APP::getEnabledApps() as $app) {
+		foreach (OC_App::getEnabledApps() as $app) {
 			$appPath = OC_App::getAppPath($app);
 			if ($appPath === false) {
 				continue;
@@ -523,14 +545,9 @@ class OC {
 		OC_Util::isSetLocaleWorking();
 
 		if (!defined('PHPUNIT_RUN')) {
-			$logger = \OC::$server->getLogger();
-			OC\Log\ErrorHandler::setLogger($logger);
-			if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
-				OC\Log\ErrorHandler::register(true);
-				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
-			} else {
-				OC\Log\ErrorHandler::register();
-			}
+			OC\Log\ErrorHandler::setLogger(\OC::$server->getLogger());
+			$debug = \OC::$server->getConfig()->getSystemValue('debug', false);
+			OC\Log\ErrorHandler::register($debug);
 		}
 
 		// register the stream wrappers
@@ -754,7 +771,7 @@ class OC {
 	public static function registerShareHooks() {
 		if (\OC::$server->getSystemConfig()->getValue('installed')) {
 			OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share20\Hooks', 'post_deleteUser');
-			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share\Hooks', 'post_removeFromGroup');
+			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share20\Hooks', 'post_removeFromGroup');
 			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share20\Hooks', 'post_deleteGroup');
 		}
 	}
@@ -836,7 +853,7 @@ class OC {
 			}
 		}
 
-		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
+		if (!self::$CLI) {
 			try {
 				if (!$systemConfig->getValue('maintenance', false) && !self::checkUpgrade(false)) {
 					OC_App::loadApps(array('filesystem', 'logging'));
@@ -875,31 +892,13 @@ class OC {
 			return;
 		}
 
-		// Redirect to index if the logout link is accessed without valid session
-		// this is needed to prevent "Token expired" messages while login if a session is expired
-		// @see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
-		if(isset($_GET['logout']) && !OC_User::isLoggedIn()) {
-			header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/'));
-			return;
-		}
-
 		// Someone is logged in
 		if (OC_User::isLoggedIn()) {
 			OC_App::loadApps();
 			OC_User::setupBackends();
 			OC_Util::setupFS();
-			if (isset($_GET["logout"]) and ($_GET["logout"])) {
-				OC_JSON::callCheck();
-				if (isset($_COOKIE['oc_token'])) {
-					\OC::$server->getConfig()->deleteUserValue(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
-				}
-				OC_User::logout();
-				// redirect to webroot and add slash if webroot is empty
-				header("Location: " . \OC::$server->getURLGenerator()->getAbsoluteURL('/'));
-			} else {
-				// Redirect to default application
-				OC_Util::redirectToDefaultPage();
-			}
+			// Redirect to default application
+			OC_Util::redirectToDefaultPage();
 		} else {
 			// Not handled and not logged in
 			self::handleLogin();
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 1bc7d036530..a807dab7190 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
     "Sample configuration detected" : "Configuración d'amuesa detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectose que la configuración d'amuesa copiose. Esto pue encaboxar la instalación y dexala ensín soporte. Llee la documentación enantes de facer cambéos en config.php",
-    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
     "PHP %s or higher is required." : "Necesítase PHP %s o superior",
     "PHP with a version lower than %s is required." : "Necesítase una versión PHP anterior a %s",
     "Following databases are supported: %s" : "Les siguientes bases de datos tan sofitaes: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Les siguientes plataformes tan sofitaes: %s",
     "ownCloud %s or higher is required." : "Necesítase ownCloud %s o superior.",
     "ownCloud %s or lower is required." : "Necesítase ownCloud %s o anterior.",
+    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
     "Help" : "Ayuda",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index 845674462a6..61161c633a8 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
     "Sample configuration detected" : "Configuración d'amuesa detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectose que la configuración d'amuesa copiose. Esto pue encaboxar la instalación y dexala ensín soporte. Llee la documentación enantes de facer cambéos en config.php",
-    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
     "PHP %s or higher is required." : "Necesítase PHP %s o superior",
     "PHP with a version lower than %s is required." : "Necesítase una versión PHP anterior a %s",
     "Following databases are supported: %s" : "Les siguientes bases de datos tan sofitaes: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Les siguientes plataformes tan sofitaes: %s",
     "ownCloud %s or higher is required." : "Necesítase ownCloud %s o superior.",
     "ownCloud %s or lower is required." : "Necesítase ownCloud %s o anterior.",
+    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
     "Help" : "Ayuda",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js
index ee5258e5514..394e72d544e 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg_BG.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в config папката %s.",
     "Sample configuration detected" : "Открита е примерна конфигурация",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
-    "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.",
     "PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
     "PHP with a version lower than %s is required." : "Необходим е PHP с версия по-ниска от %s.",
     "Following databases are supported: %s" : "Следните бази данни са поддържани: %s",
@@ -17,6 +16,7 @@ OC.L10N.register(
     "Library %s with a version lower than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-ниска от %s - налична версия %s. ",
     "Following platforms are supported: %s" : "Поддържани са следните платформи: %s",
     "ownCloud %s or higher is required." : "Необходим е ownCloud %s или по-висока версия.",
+    "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.",
     "Help" : "Помощ",
     "Personal" : "Лични",
     "Users" : "Потребители",
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
index f5259d70946..4f6a9c52a32 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg_BG.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в config папката %s.",
     "Sample configuration detected" : "Открита е примерна конфигурация",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
-    "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.",
     "PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
     "PHP with a version lower than %s is required." : "Необходим е PHP с версия по-ниска от %s.",
     "Following databases are supported: %s" : "Следните бази данни са поддържани: %s",
@@ -15,6 +14,7 @@
     "Library %s with a version lower than %s is required - available version %s." : "Необходима е библиотеката %s с версия по-ниска от %s - налична версия %s. ",
     "Following platforms are supported: %s" : "Поддържани са следните платформи: %s",
     "ownCloud %s or higher is required." : "Необходим е ownCloud %s или по-висока версия.",
+    "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.",
     "Help" : "Помощ",
     "Personal" : "Лични",
     "Users" : "Потребители",
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index 83f81441f14..763e742f3b4 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -7,8 +7,8 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
     "Sample configuration detected" : "Configuració d'exemple detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S'ha detectat que la configuració d'exemple ha estat copiada. Això no està suportat, i podria corrompre la vostra instalació. Siusplau, llegiu la documentació abans de realitzar canvis a config.php",
-    "You are not allowed to share %s" : "No se us permet compartir %s",
     "PHP %s or higher is required." : "Es requereix PHP %s o superior.",
+    "You are not allowed to share %s" : "No se us permet compartir %s",
     "Help" : "Ajuda",
     "Personal" : "Personal",
     "Users" : "Usuaris",
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index 8a32487cbe4..49dbe1ac3c3 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -5,8 +5,8 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
     "Sample configuration detected" : "Configuració d'exemple detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S'ha detectat que la configuració d'exemple ha estat copiada. Això no està suportat, i podria corrompre la vostra instalació. Siusplau, llegiu la documentació abans de realitzar canvis a config.php",
-    "You are not allowed to share %s" : "No se us permet compartir %s",
     "PHP %s or higher is required." : "Es requereix PHP %s o superior.",
+    "You are not allowed to share %s" : "No se us permet compartir %s",
     "Help" : "Ajuda",
     "Personal" : "Personal",
     "Users" : "Usuaris",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 6fced6db37e..c96ea1ae8f8 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til config-mappen%s.",
     "Sample configuration detected" : "Eksempel for konfiguration registreret",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php",
-    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
-    "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s",
-    "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid",
-    "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden",
     "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.",
     "PHP with a version lower than %s is required." : "Der kræves PHP %s eller ældre.",
     "Following databases are supported: %s" : "Følgende databaser understøttes: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Følgende platforme understøttes: %s",
     "ownCloud %s or higher is required." : "Der kræves ownCloud %s eller højere.",
     "ownCloud %s or lower is required." : "ownCloud %s eller lavere er påkrævet.",
+    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
+    "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s",
+    "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid",
+    "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden",
     "Help" : "Hjælp",
     "Personal" : "Personligt",
     "Users" : "Brugere",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index 7a4a273e337..9577c26c628 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til config-mappen%s.",
     "Sample configuration detected" : "Eksempel for konfiguration registreret",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php",
-    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
-    "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s",
-    "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid",
-    "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden",
     "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.",
     "PHP with a version lower than %s is required." : "Der kræves PHP %s eller ældre.",
     "Following databases are supported: %s" : "Følgende databaser understøttes: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Følgende platforme understøttes: %s",
     "ownCloud %s or higher is required." : "Der kræves ownCloud %s eller højere.",
     "ownCloud %s or lower is required." : "ownCloud %s eller lavere er påkrævet.",
+    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
+    "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s",
+    "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid",
+    "Cannot set expiration date more than %s days in the future" : "Udløbsdato kan ikke sættes mere end %s dage ud i fremtiden",
     "Help" : "Hjælp",
     "Personal" : "Personligt",
     "Users" : "Brugere",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 64250641b77..39fc4abd904 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das Konfigurationsverzeichnis gegeben wird%s.",
     "Sample configuration detected" : "Beispielkonfiguration gefunden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Deine Installation zerstören und wird nicht unterstützt. Bitte lies die Dokumentation, bevor Du Änderungen an der config.php vornimmst.",
-    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
-    "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen",
-    "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit",
-    "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen",
     "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
     "PHP with a version lower than %s is required." : "PHP wird in einer früheren Version als %s benötigt.",
     "Following databases are supported: %s" : "Die folgenden Datenbanken werden unterstützt: %s",
@@ -21,6 +17,12 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
     "ownCloud %s or higher is required." : "ownCloud %s oder höher wird benötigt.",
     "ownCloud %s or lower is required." : "ownCloud %s oder niedriger wird benötigt.",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
+    "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen",
+    "Files can't be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden",
+    "Files can't be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden",
+    "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit",
+    "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen",
     "Help" : "Hilfe",
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 633ab47d9de..a81cb8de631 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das Konfigurationsverzeichnis gegeben wird%s.",
     "Sample configuration detected" : "Beispielkonfiguration gefunden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Deine Installation zerstören und wird nicht unterstützt. Bitte lies die Dokumentation, bevor Du Änderungen an der config.php vornimmst.",
-    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
-    "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen",
-    "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit",
-    "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen",
     "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
     "PHP with a version lower than %s is required." : "PHP wird in einer früheren Version als %s benötigt.",
     "Following databases are supported: %s" : "Die folgenden Datenbanken werden unterstützt: %s",
@@ -19,6 +15,12 @@
     "Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
     "ownCloud %s or higher is required." : "ownCloud %s oder höher wird benötigt.",
     "ownCloud %s or lower is required." : "ownCloud %s oder niedriger wird benötigt.",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
+    "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen",
+    "Files can't be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden",
+    "Files can't be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden",
+    "Expiration date is in the past" : "Ablaufdatum ist in der Vergangenheit",
+    "Cannot set expiration date more than %s days in the future" : "Das Ablaufdatum kann nicht mehr als %s Tage in die Zukunft liegen",
     "Help" : "Hilfe",
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 54270493749..7908b04f62e 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das Konfigurationsverzeichnis gegeben wird%s.",
     "Sample configuration detected" : "Beispielkonfiguration gefunden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Ihre Installation zerstören und wird nicht unterstützt. Bitte lesen Sie die Dokumentation, bevor Sie Änderungen an der config.php vornehmen.",
-    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
-    "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen",
-    "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.",
-    "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen",
     "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
     "PHP with a version lower than %s is required." : "PHP wird in einer früheren Version als %s benötigt.",
     "Following databases are supported: %s" : "Die folgenden Datenbanken werden unterstützt: %s",
@@ -21,6 +17,12 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
     "ownCloud %s or higher is required." : "ownCloud %s oder höher wird benötigt.",
     "ownCloud %s or lower is required." : "ownCloud %s oder niedriger wird benötigt.",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
+    "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen",
+    "Files can't be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden",
+    "Files can't be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden",
+    "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.",
+    "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen",
     "Help" : "Hilfe",
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 49abf03a567..710df8c6b37 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise behoben werden, %sindem dem Webserver Schreibzugriff auf das Konfigurationsverzeichnis gegeben wird%s.",
     "Sample configuration detected" : "Beispielkonfiguration gefunden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Ihre Installation zerstören und wird nicht unterstützt. Bitte lesen Sie die Dokumentation, bevor Sie Änderungen an der config.php vornehmen.",
-    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
-    "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen",
-    "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.",
-    "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen",
     "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
     "PHP with a version lower than %s is required." : "PHP wird in einer früheren Version als %s benötigt.",
     "Following databases are supported: %s" : "Die folgenden Datenbanken werden unterstützt: %s",
@@ -19,6 +15,12 @@
     "Following platforms are supported: %s" : "Die folgenden Plattformen werden unterstützt: %s",
     "ownCloud %s or higher is required." : "ownCloud %s oder höher wird benötigt.",
     "ownCloud %s or lower is required." : "ownCloud %s oder niedriger wird benötigt.",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
+    "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen",
+    "Files can't be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden",
+    "Files can't be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden",
+    "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.",
+    "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen",
     "Help" : "Hilfe",
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index c8af11fbcd7..1b6a874abae 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Αυτό μπορεί συνήθως να διορθωθεί %sπαρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου%s.",
     "Sample configuration detected" : "Ανιχνεύθηκε δείγμα εγκατάστασης",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Έχει ανιχνευθεί ότι το δείγμα εγκατάστασης έχει αντιγραφεί. Αυτό μπορεί να σπάσει την εγκατάστασή σας και δεν υποστηρίζεται. Παρακαλώ διαβάστε την τεκμηρίωση πριν εκτελέσετε αλλαγές στο config.php",
-    "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
     "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.",
     "PHP with a version lower than %s is required." : "Απαιτείται PHP παλαιότερη από την έκδοση %s.",
     "Following databases are supported: %s" : " Υποστηρίζονται οι ακόλουθες βάσεις δεδομένων: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Οι ακόλουθες πλατφόρμες υποστηρίζονται: %s",
     "ownCloud %s or higher is required." : "Απαιτείται ownCloud %s ή νεότερο",
     "ownCloud %s or lower is required." : "Απαιτείται έκδοση του ownCloud παλαιότερη από την %s.",
+    "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
     "Help" : "Βοήθεια",
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index 932113e5dd7..0c9bfca41d9 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Αυτό μπορεί συνήθως να διορθωθεί %sπαρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου%s.",
     "Sample configuration detected" : "Ανιχνεύθηκε δείγμα εγκατάστασης",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Έχει ανιχνευθεί ότι το δείγμα εγκατάστασης έχει αντιγραφεί. Αυτό μπορεί να σπάσει την εγκατάστασή σας και δεν υποστηρίζεται. Παρακαλώ διαβάστε την τεκμηρίωση πριν εκτελέσετε αλλαγές στο config.php",
-    "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
     "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.",
     "PHP with a version lower than %s is required." : "Απαιτείται PHP παλαιότερη από την έκδοση %s.",
     "Following databases are supported: %s" : " Υποστηρίζονται οι ακόλουθες βάσεις δεδομένων: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Οι ακόλουθες πλατφόρμες υποστηρίζονται: %s",
     "ownCloud %s or higher is required." : "Απαιτείται ownCloud %s ή νεότερο",
     "ownCloud %s or lower is required." : "Απαιτείται έκδοση του ownCloud παλαιότερη από την %s.",
+    "You are not allowed to share %s" : "Δεν επιτρέπεται να διαμοιράσετε τον πόρο %s",
     "Help" : "Βοήθεια",
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index 4ce04e5a6b8..fc17a32c99c 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
     "Sample configuration detected" : "Sample configuration detected",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
-    "You are not allowed to share %s" : "You are not allowed to share %s",
-    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
-    "Expiration date is in the past" : "Expiration date is in the past",
-    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
     "PHP %s or higher is required." : "PHP %s or higher is required.",
     "PHP with a version lower than %s is required." : "PHP with a version lower than %s is required.",
     "Following databases are supported: %s" : "Following databases are supported: %s",
@@ -21,11 +17,16 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Following platforms are supported: %s",
     "ownCloud %s or higher is required." : "ownCloud %s or higher is required.",
     "ownCloud %s or lower is required." : "ownCloud %s or lower is required.",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
+    "Expiration date is in the past" : "Expiration date is in the past",
+    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
     "Help" : "Help",
     "Personal" : "Personal",
     "Users" : "Users",
     "Admin" : "Admin",
     "Recommended" : "Recommended",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud.",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s",
     "No app name specified" : "No app name specified",
@@ -60,6 +61,7 @@ OC.L10N.register(
     "Archives of type %s are not supported" : "Archives of type %s are not supported",
     "Failed to open archive when installing app" : "Failed to open archive when installing app",
     "App does not provide an info.xml file" : "App does not provide an info.xml file",
+    "App cannot be installed because appinfo file cannot be read." : "App cannot be installed because appinfo file cannot be read.",
     "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signature could not get checked. Please contact the app developer and check your admin screen.",
     "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
     "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
@@ -131,6 +133,7 @@ OC.L10N.register(
     "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
     "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>.",
     "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
     "Setting locale to %s failed" : "Setting locale to %s failed",
     "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index ef503400cad..9275dd4e111 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
     "Sample configuration detected" : "Sample configuration detected",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
-    "You are not allowed to share %s" : "You are not allowed to share %s",
-    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
-    "Expiration date is in the past" : "Expiration date is in the past",
-    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
     "PHP %s or higher is required." : "PHP %s or higher is required.",
     "PHP with a version lower than %s is required." : "PHP with a version lower than %s is required.",
     "Following databases are supported: %s" : "Following databases are supported: %s",
@@ -19,11 +15,16 @@
     "Following platforms are supported: %s" : "Following platforms are supported: %s",
     "ownCloud %s or higher is required." : "ownCloud %s or higher is required.",
     "ownCloud %s or lower is required." : "ownCloud %s or lower is required.",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
+    "Expiration date is in the past" : "Expiration date is in the past",
+    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
     "Help" : "Help",
     "Personal" : "Personal",
     "Users" : "Users",
     "Admin" : "Admin",
     "Recommended" : "Recommended",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud.",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s",
     "No app name specified" : "No app name specified",
@@ -58,6 +59,7 @@
     "Archives of type %s are not supported" : "Archives of type %s are not supported",
     "Failed to open archive when installing app" : "Failed to open archive when installing app",
     "App does not provide an info.xml file" : "App does not provide an info.xml file",
+    "App cannot be installed because appinfo file cannot be read." : "App cannot be installed because appinfo file cannot be read.",
     "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signature could not get checked. Please contact the app developer and check your admin screen.",
     "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
     "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
@@ -129,6 +131,7 @@
     "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
     "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>.",
     "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
     "Setting locale to %s failed" : "Setting locale to %s failed",
     "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js
index a4c82a25dc6..ac3a83ace78 100644
--- a/lib/l10n/eo.js
+++ b/lib/l10n/eo.js
@@ -3,15 +3,15 @@ OC.L10N.register(
     {
     "Cannot write into \"config\" directory!" : "Ne skribeblas la dosierujo “config”!",
     "See %s" : "Vidi %s",
-    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
-    "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s",
-    "Expiration date is in the past" : "Senvalidiĝa dato estintas",
     "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.",
     "PHP with a version lower than %s is required." : "Necesas pli malalta eldono de PHP ol %s.",
     "Following databases are supported: %s" : "La jenan datumbazoj kongruas: %s",
     "The command line tool %s could not be found" : "La komandolinia ilo %s ne troviĝis",
     "The library %s is not available." : "La biblioteko %s ne haveblas.",
     "ownCloud %s or higher is required." : "ownCloud %s aŭ pli alta necesas.",
+    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
+    "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s",
+    "Expiration date is in the past" : "Senvalidiĝa dato estintas",
     "Help" : "Helpo",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json
index 818772e4af5..1443fe388a0 100644
--- a/lib/l10n/eo.json
+++ b/lib/l10n/eo.json
@@ -1,15 +1,15 @@
 { "translations": {
     "Cannot write into \"config\" directory!" : "Ne skribeblas la dosierujo “config”!",
     "See %s" : "Vidi %s",
-    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
-    "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s",
-    "Expiration date is in the past" : "Senvalidiĝa dato estintas",
     "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.",
     "PHP with a version lower than %s is required." : "Necesas pli malalta eldono de PHP ol %s.",
     "Following databases are supported: %s" : "La jenan datumbazoj kongruas: %s",
     "The command line tool %s could not be found" : "La komandolinia ilo %s ne troviĝis",
     "The library %s is not available." : "La biblioteko %s ne haveblas.",
     "ownCloud %s or higher is required." : "ownCloud %s aŭ pli alta necesas.",
+    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
+    "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s",
+    "Expiration date is in the past" : "Senvalidiĝa dato estintas",
     "Help" : "Helpo",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 15c89e580ec..38a1036e50d 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -7,8 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tavaliselt saab selle lahendada %s andes veebiserverile seadete kataloogile \"config\" kirjutusõigused %s",
     "Sample configuration detected" : "Tuvastati näidisseaded",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Tuvastati, et kopeeriti näidisseaded. See võib lõhkuda sinu saidi ja see pole toetatud. Palun loe enne faili config.php muutmist dokumentatsiooni",
-    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
-    "Expiration date is in the past" : "Aegumise kuupäev on minevikus",
     "PHP %s or higher is required." : "PHP %s või uuem on nõutav.",
     "PHP with a version lower than %s is required." : "Nõutud on PHP madalama versiooniga kui %s.",
     "Following databases are supported: %s" : "Toetatud on järgnevad andmebaasid: %s",
@@ -17,6 +15,8 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Toetatud on järgnevad platformid: %s",
     "ownCloud %s or higher is required." : "ownCloud %s või uuem on nõutav.",
     "ownCloud %s or lower is required." : "ownCloud %s või vanem on nõutav.",
+    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
+    "Expiration date is in the past" : "Aegumise kuupäev on minevikus",
     "Help" : "Abiinfo",
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index 2e8e06265e6..00db79e2251 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -5,8 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tavaliselt saab selle lahendada %s andes veebiserverile seadete kataloogile \"config\" kirjutusõigused %s",
     "Sample configuration detected" : "Tuvastati näidisseaded",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Tuvastati, et kopeeriti näidisseaded. See võib lõhkuda sinu saidi ja see pole toetatud. Palun loe enne faili config.php muutmist dokumentatsiooni",
-    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
-    "Expiration date is in the past" : "Aegumise kuupäev on minevikus",
     "PHP %s or higher is required." : "PHP %s või uuem on nõutav.",
     "PHP with a version lower than %s is required." : "Nõutud on PHP madalama versiooniga kui %s.",
     "Following databases are supported: %s" : "Toetatud on järgnevad andmebaasid: %s",
@@ -15,6 +13,8 @@
     "Following platforms are supported: %s" : "Toetatud on järgnevad platformid: %s",
     "ownCloud %s or higher is required." : "ownCloud %s või uuem on nõutav.",
     "ownCloud %s or lower is required." : "ownCloud %s või vanem on nõutav.",
+    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
+    "Expiration date is in the past" : "Aegumise kuupäev on minevikus",
     "Help" : "Abiinfo",
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 05c7eb4eae9..ef4b3f4c0a9 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira config karpetan idazteko baimenak emanez%s.",
     "Sample configuration detected" : "Adibide-ezarpena detektatua",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
-    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
     "PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
     "PHP with a version lower than %s is required." : "PHPren bertsioa %s baino txikiagoa izan behar da.",
     "Following databases are supported: %s" : "Hurrengo datubaseak onartzen dira: %s",
@@ -17,6 +16,7 @@ OC.L10N.register(
     "Library %s with a version lower than %s is required - available version %s." : "%s liburutegiak %s baino bertsio txikiagoa izan behar du - dagoen bertsioa %s.",
     "Following platforms are supported: %s" : "Hurrengo plataformak onartzen dira: %s",
     "ownCloud %s or higher is required." : "ownCloud %s edo haundiagoa behar da.",
+    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
     "Help" : "Laguntza",
     "Personal" : "Pertsonala",
     "Users" : "Erabiltzaileak",
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index 2efeab539da..7559f2eb8e8 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira config karpetan idazteko baimenak emanez%s.",
     "Sample configuration detected" : "Adibide-ezarpena detektatua",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
-    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
     "PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
     "PHP with a version lower than %s is required." : "PHPren bertsioa %s baino txikiagoa izan behar da.",
     "Following databases are supported: %s" : "Hurrengo datubaseak onartzen dira: %s",
@@ -15,6 +14,7 @@
     "Library %s with a version lower than %s is required - available version %s." : "%s liburutegiak %s baino bertsio txikiagoa izan behar du - dagoen bertsioa %s.",
     "Following platforms are supported: %s" : "Hurrengo plataformak onartzen dira: %s",
     "ownCloud %s or higher is required." : "ownCloud %s edo haundiagoa behar da.",
+    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
     "Help" : "Laguntza",
     "Personal" : "Pertsonala",
     "Users" : "Erabiltzaileak",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index a7a35b1ea1d..0ad89e020fc 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -6,10 +6,6 @@ OC.L10N.register(
     "See %s" : "Katso %s",
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
     "Sample configuration detected" : "Esimerkkimääritykset havaittu",
-    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
-    "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu",
-    "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä",
-    "Cannot set expiration date more than %s days in the future" : "Vanhenemispäivä voi olla korkeintaan %s päivän päässä tulevaisuudessa",
     "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
     "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.",
     "Following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s",
@@ -20,6 +16,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s",
     "ownCloud %s or higher is required." : "ownCloud %s tai uudempi vaaditaan.",
     "ownCloud %s or lower is required." : "ownCloud %s tai aiempi vaaditaan.",
+    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
+    "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu",
+    "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä",
+    "Cannot set expiration date more than %s days in the future" : "Vanhenemispäivä voi olla korkeintaan %s päivän päässä tulevaisuudessa",
     "Help" : "Ohje",
     "Personal" : "Henkilökohtainen",
     "Users" : "Käyttäjät",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index 1267b344f78..79cc08e4f82 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -4,10 +4,6 @@
     "See %s" : "Katso %s",
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
     "Sample configuration detected" : "Esimerkkimääritykset havaittu",
-    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
-    "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu",
-    "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä",
-    "Cannot set expiration date more than %s days in the future" : "Vanhenemispäivä voi olla korkeintaan %s päivän päässä tulevaisuudessa",
     "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
     "PHP with a version lower than %s is required." : "PHP versiota %s alempi tarvitaan.",
     "Following databases are supported: %s" : "Seuraavat tietokannat ovat tuettuja: %s",
@@ -18,6 +14,10 @@
     "Following platforms are supported: %s" : "Seuraavat alustat ovat tuettuja: %s",
     "ownCloud %s or higher is required." : "ownCloud %s tai uudempi vaaditaan.",
     "ownCloud %s or lower is required." : "ownCloud %s tai aiempi vaaditaan.",
+    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
+    "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu",
+    "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä",
+    "Cannot set expiration date more than %s days in the future" : "Vanhenemispäivä voi olla korkeintaan %s päivän päässä tulevaisuudessa",
     "Help" : "Ohje",
     "Personal" : "Henkilökohtainen",
     "Users" : "Käyttäjät",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 51f22a711a4..ee92b5af7f7 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
     "Sample configuration detected" : "Configuration d'exemple détectée",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
-    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
-    "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
-    "Expiration date is in the past" : "La date d'expiration est dans le passé",
-    "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
     "PHP with a version lower than %s is required." : "PHP avec une version antérieure à %s est requis.",
     "Following databases are supported: %s" : "Les bases de données suivantes sont supportées : %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
     "ownCloud %s or higher is required." : "ownCloud %s ou supérieur est requis.",
     "ownCloud %s or lower is required." : "ownCloud %s ou inférieur est requis.",
+    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
+    "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
+    "Expiration date is in the past" : "La date d'expiration est dans le passé",
+    "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "Help" : "Aide",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index d7351b2d422..5ebb4438e53 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
     "Sample configuration detected" : "Configuration d'exemple détectée",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
-    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
-    "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
-    "Expiration date is in the past" : "La date d'expiration est dans le passé",
-    "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
     "PHP with a version lower than %s is required." : "PHP avec une version antérieure à %s est requis.",
     "Following databases are supported: %s" : "Les bases de données suivantes sont supportées : %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Les plateformes suivantes sont prises en charge : %s",
     "ownCloud %s or higher is required." : "ownCloud %s ou supérieur est requis.",
     "ownCloud %s or lower is required." : "ownCloud %s ou inférieur est requis.",
+    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
+    "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
+    "Expiration date is in the past" : "La date d'expiration est dans le passé",
+    "Cannot set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "Help" : "Aide",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index 47a41687c3e..e51717224d1 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
     "Sample configuration detected" : "Detectouse a configuración de exemplo",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectouse que foi copiada a configuración de exemplo. Isto pode rachar a súa instalación e non é compatíbel. Lea a documentación antes de facer cambios en config.php",
-    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
     "PHP %s or higher is required." : "Requirese PHP %s ou superior.",
     "PHP with a version lower than %s is required." : "Requírese PHP cunha versión inferior a %s.",
     "Following databases are supported: %s" : "Admítense as seguintes bases de datos: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Admítense as seguintes plataformas: %s",
     "ownCloud %s or higher is required." : "Requírese ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "Requírese ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
     "Help" : "Axuda",
     "Personal" : "Persoal",
     "Users" : "Usuarios",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index e401047b21b..bee95609bf1 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
     "Sample configuration detected" : "Detectouse a configuración de exemplo",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectouse que foi copiada a configuración de exemplo. Isto pode rachar a súa instalación e non é compatíbel. Lea a documentación antes de facer cambios en config.php",
-    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
     "PHP %s or higher is required." : "Requirese PHP %s ou superior.",
     "PHP with a version lower than %s is required." : "Requírese PHP cunha versión inferior a %s.",
     "Following databases are supported: %s" : "Admítense as seguintes bases de datos: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Admítense as seguintes plataformas: %s",
     "ownCloud %s or higher is required." : "Requírese ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "Requírese ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
     "Help" : "Axuda",
     "Personal" : "Persoal",
     "Users" : "Usuarios",
diff --git a/lib/l10n/he.js b/lib/l10n/he.js
index 2b171ae887a..2e0f988e1c9 100644
--- a/lib/l10n/he.js
+++ b/lib/l10n/he.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "בדרך כלל ניתן לפתור את הבעיה על ידי כך ש- %s נותן ל- webserver הרשאות כניסה לתיקיית config %s.",
     "Sample configuration detected" : "התגלתה דוגמת תצורה",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php",
-    "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s",
-    "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s",
-    "Expiration date is in the past" : "תאריך תפוגה הנו בעבר",
-    "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד",
     "PHP %s or higher is required." : "נדרש PHP בגרסת %s ומעלה.",
     "PHP with a version lower than %s is required." : "נדרש PHP בגרסה נמוכה מ- %s.",
     "Following databases are supported: %s" : "מסדי הנתונים הבאים נתמכים: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "הפלטפורמות הבאות נתמכות: %s",
     "ownCloud %s or higher is required." : "נדרש ownCloud %s ומעלה.",
     "ownCloud %s or lower is required." : "נדרש ownCloud %s ומטה.",
+    "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s",
+    "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s",
+    "Expiration date is in the past" : "תאריך תפוגה הנו בעבר",
+    "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד",
     "Help" : "עזרה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
diff --git a/lib/l10n/he.json b/lib/l10n/he.json
index 97812942d56..c9592003d38 100644
--- a/lib/l10n/he.json
+++ b/lib/l10n/he.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "בדרך כלל ניתן לפתור את הבעיה על ידי כך ש- %s נותן ל- webserver הרשאות כניסה לתיקיית config %s.",
     "Sample configuration detected" : "התגלתה דוגמת תצורה",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php",
-    "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s",
-    "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s",
-    "Expiration date is in the past" : "תאריך תפוגה הנו בעבר",
-    "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד",
     "PHP %s or higher is required." : "נדרש PHP בגרסת %s ומעלה.",
     "PHP with a version lower than %s is required." : "נדרש PHP בגרסה נמוכה מ- %s.",
     "Following databases are supported: %s" : "מסדי הנתונים הבאים נתמכים: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "הפלטפורמות הבאות נתמכות: %s",
     "ownCloud %s or higher is required." : "נדרש ownCloud %s ומעלה.",
     "ownCloud %s or lower is required." : "נדרש ownCloud %s ומטה.",
+    "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s",
+    "Cannot increase permissions of %s" : "לא ניתן להגדיל את ההיתרים של %s",
+    "Expiration date is in the past" : "תאריך תפוגה הנו בעבר",
+    "Cannot set expiration date more than %s days in the future" : "לא ניתן להגדיר את תאריך התפוגה מעל %s ימים בעתיד",
     "Help" : "עזרה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
index 3ce3d9098da..fd1e44c51b6 100644
--- a/lib/l10n/hr.js
+++ b/lib/l10n/hr.js
@@ -7,13 +7,13 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u config direktoriju%s.",
     "Sample configuration detected" : "Nađena ogledna konfiguracija",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Otkriveno je da je ogledna konfiguracija kopirana. To može vašu instalaciju prekinuti i nije podržano.Molimo pročitajte dokumentaciju prije nego li izvršite promjene na config.php",
-    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
     "PHP %s or higher is required." : "PHP verzija treba biti %s ili viša.",
     "PHP with a version lower than %s is required." : "PHP sa verzijom manjom od %s je potrebna.",
     "Following databases are supported: %s" : "Sljedece baza podataka je podrzana: %s",
     "The library %s is not available." : "Knjiznica %s nije dostupna.",
     "Following platforms are supported: %s" : "Sljedece platforme su podrzane: %s",
     "ownCloud %s or higher is required." : "ownCloud %s ili visi je potreban.",
+    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
     "Help" : "Pomoć",
     "Personal" : "Osobno",
     "Users" : "Korisnici",
diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json
index 6651f7dda1a..1c02e4859eb 100644
--- a/lib/l10n/hr.json
+++ b/lib/l10n/hr.json
@@ -5,13 +5,13 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u config direktoriju%s.",
     "Sample configuration detected" : "Nađena ogledna konfiguracija",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Otkriveno je da je ogledna konfiguracija kopirana. To može vašu instalaciju prekinuti i nije podržano.Molimo pročitajte dokumentaciju prije nego li izvršite promjene na config.php",
-    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
     "PHP %s or higher is required." : "PHP verzija treba biti %s ili viša.",
     "PHP with a version lower than %s is required." : "PHP sa verzijom manjom od %s je potrebna.",
     "Following databases are supported: %s" : "Sljedece baza podataka je podrzana: %s",
     "The library %s is not available." : "Knjiznica %s nije dostupna.",
     "Following platforms are supported: %s" : "Sljedece platforme su podrzane: %s",
     "ownCloud %s or higher is required." : "ownCloud %s ili visi je potreban.",
+    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
     "Help" : "Pomoć",
     "Personal" : "Osobno",
     "Users" : "Korisnici",
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index b704ce1e536..f59c457e5ff 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek a config könyvtárra%s.",
     "Sample configuration detected" : "A példabeállítások vannak beállítva",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
-    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
     "PHP with a version lower than %s is required." : "Ennél régebbi PHP szükséges: %s.",
     "Following databases are supported: %s" : "A következő adatbázisok támogatottak: %s",
@@ -15,6 +14,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Ezek a platformok támogatottak: %s",
     "ownCloud %s or higher is required." : "ownCoud %s vagy ennél újabb szükséges.",
     "ownCloud %s or lower is required." : "ownCoud %s vagy ennél régebbi szükséges.",
+    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "Help" : "Súgó",
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index 10c28c20c8c..5e980ac90d2 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek a config könyvtárra%s.",
     "Sample configuration detected" : "A példabeállítások vannak beállítva",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
-    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
     "PHP with a version lower than %s is required." : "Ennél régebbi PHP szükséges: %s.",
     "Following databases are supported: %s" : "A következő adatbázisok támogatottak: %s",
@@ -13,6 +12,7 @@
     "Following platforms are supported: %s" : "Ezek a platformok támogatottak: %s",
     "ownCloud %s or higher is required." : "ownCoud %s vagy ennél újabb szükséges.",
     "ownCloud %s or lower is required." : "ownCoud %s vagy ennél régebbi szükséges.",
+    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "Help" : "Súgó",
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 612a34ddee0..1b18e494c88 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
     "Sample configuration detected" : "Konfigurasi sampel ditemukan",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
-    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
     "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
     "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.",
     "Following databases are supported: %s" : "Berikut adalah basis data yang didukung: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Berikut adalah platform yang didukung: %s",
     "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
     "ownCloud %s or lower is required." : "ownCloud %s atau yang lebih rendah diperlukan.",
+    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
     "Help" : "Bantuan",
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 464f00c6cd2..d04c6b589e3 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
     "Sample configuration detected" : "Konfigurasi sampel ditemukan",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
-    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
     "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
     "PHP with a version lower than %s is required." : "Diperlukan PHP dengan versi yang lebh rendah dari %s.",
     "Following databases are supported: %s" : "Berikut adalah basis data yang didukung: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Berikut adalah platform yang didukung: %s",
     "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
     "ownCloud %s or lower is required." : "ownCloud %s atau yang lebih rendah diperlukan.",
+    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
     "Help" : "Bantuan",
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index ad0b50d3fc5..84056759b21 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"config\"%s",
     "Sample configuration detected" : "Configurazione di esempio rilevata",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "È stato rilevato che la configurazione di esempio è stata copiata. Ciò può compromettere la tua installazione e non è supportato. Leggi la documentazione prima di modificare il file config.php",
-    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
-    "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s",
-    "Expiration date is in the past" : "La data di scadenza è nel passato",
-    "Cannot set expiration date more than %s days in the future" : "Impossibile impostare la data di scadenza a più di %s giorni nel futuro",
     "PHP %s or higher is required." : "Richiesto PHP %s o superiore",
     "PHP with a version lower than %s is required." : "Richiesta una versione di PHP minore di %s.",
     "Following databases are supported: %s" : "I seguenti database sono supportati: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Sono supportate le seguenti piattaforme: %s",
     "ownCloud %s or higher is required." : "Richiesto ownCloud %s o superiore.",
     "ownCloud %s or lower is required." : "Richiesto ownCloud %s o inferiore.",
+    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
+    "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s",
+    "Expiration date is in the past" : "La data di scadenza è nel passato",
+    "Cannot set expiration date more than %s days in the future" : "Impossibile impostare la data di scadenza a più di %s giorni nel futuro",
     "Help" : "Aiuto",
     "Personal" : "Personale",
     "Users" : "Utenti",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 93acead882f..618036df4a0 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"config\"%s",
     "Sample configuration detected" : "Configurazione di esempio rilevata",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "È stato rilevato che la configurazione di esempio è stata copiata. Ciò può compromettere la tua installazione e non è supportato. Leggi la documentazione prima di modificare il file config.php",
-    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
-    "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s",
-    "Expiration date is in the past" : "La data di scadenza è nel passato",
-    "Cannot set expiration date more than %s days in the future" : "Impossibile impostare la data di scadenza a più di %s giorni nel futuro",
     "PHP %s or higher is required." : "Richiesto PHP %s o superiore",
     "PHP with a version lower than %s is required." : "Richiesta una versione di PHP minore di %s.",
     "Following databases are supported: %s" : "I seguenti database sono supportati: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Sono supportate le seguenti piattaforme: %s",
     "ownCloud %s or higher is required." : "Richiesto ownCloud %s o superiore.",
     "ownCloud %s or lower is required." : "Richiesto ownCloud %s o inferiore.",
+    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
+    "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s",
+    "Expiration date is in the past" : "La data di scadenza è nel passato",
+    "Cannot set expiration date more than %s days in the future" : "Impossibile impostare la data di scadenza a più di %s giorni nel futuro",
     "Help" : "Aiuto",
     "Personal" : "Personale",
     "Users" : "Utenti",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index d2b0e3eb8a3..2f4d02bb2b7 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "多くの場合、これは %s Webサーバーにconfigディレクトリ %s への書き込み権限を与えることで解決できます。",
     "Sample configuration detected" : "サンプル設定が見つかりました。",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "サンプル設定がコピーされてそのままです。このままではインストールが失敗し、サポート対象外になります。config.phpを変更する前にドキュメントを確認してください。",
-    "You are not allowed to share %s" : "%s を共有することを許可されていません。",
-    "Cannot increase permissions of %s" : "%s　の権限を強化できません",
-    "Expiration date is in the past" : "有効期限が切れています",
-    "Cannot set expiration date more than %s days in the future" : "有効期限を%s日以降に設定できません。",
     "PHP %s or higher is required." : "PHP %s 以上が必要です。",
     "PHP with a version lower than %s is required." : "%s 以前のバージョンのPHPが必要です。",
     "Following databases are supported: %s" : "次のデータベースをサポートしています: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "次のプラットフォームをサポートしています: %s",
     "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です。",
     "ownCloud %s or lower is required." : "ownCloud %s 以下が必要です。",
+    "You are not allowed to share %s" : "%s を共有することを許可されていません。",
+    "Cannot increase permissions of %s" : "%s　の権限を強化できません",
+    "Expiration date is in the past" : "有効期限が切れています",
+    "Cannot set expiration date more than %s days in the future" : "有効期限を%s日以降に設定できません。",
     "Help" : "ヘルプ",
     "Personal" : "個人",
     "Users" : "ユーザー",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 892091d0648..1e3a1956428 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "多くの場合、これは %s Webサーバーにconfigディレクトリ %s への書き込み権限を与えることで解決できます。",
     "Sample configuration detected" : "サンプル設定が見つかりました。",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "サンプル設定がコピーされてそのままです。このままではインストールが失敗し、サポート対象外になります。config.phpを変更する前にドキュメントを確認してください。",
-    "You are not allowed to share %s" : "%s を共有することを許可されていません。",
-    "Cannot increase permissions of %s" : "%s　の権限を強化できません",
-    "Expiration date is in the past" : "有効期限が切れています",
-    "Cannot set expiration date more than %s days in the future" : "有効期限を%s日以降に設定できません。",
     "PHP %s or higher is required." : "PHP %s 以上が必要です。",
     "PHP with a version lower than %s is required." : "%s 以前のバージョンのPHPが必要です。",
     "Following databases are supported: %s" : "次のデータベースをサポートしています: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "次のプラットフォームをサポートしています: %s",
     "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です。",
     "ownCloud %s or lower is required." : "ownCloud %s 以下が必要です。",
+    "You are not allowed to share %s" : "%s を共有することを許可されていません。",
+    "Cannot increase permissions of %s" : "%s　の権限を強化できません",
+    "Expiration date is in the past" : "有効期限が切れています",
+    "Cannot set expiration date more than %s days in the future" : "有効期限を%s日以降に設定できません。",
     "Help" : "ヘルプ",
     "Personal" : "個人",
     "Users" : "ユーザー",
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index be8f55ff83a..3c0722aa756 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%sconfig 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.",
     "Sample configuration detected" : "예제 설정 감지됨",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "예제 설정이 복사된 것 같습니다. 올바르게 작동하지 않을 수도 있기 때문에 지원되지 않습니다. config.php를 변경하기 전 문서를 읽어 보십시오",
-    "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다",
     "PHP %s or higher is required." : "PHP 버전 %s 이상이 필요합니다.",
     "PHP with a version lower than %s is required." : "PHP 버전 %s 미만이 필요합니다.",
     "Following databases are supported: %s" : "다음 데이터베이스를 지원합니다: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "다음 플랫폼을 지원합니다: %s",
     "ownCloud %s or higher is required." : "ownCloud 버전 %s 이상이 필요합니다.",
     "ownCloud %s or lower is required." : "ownCloud %s 이하가 필요합니다.",
+    "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다",
     "Help" : "도움말",
     "Personal" : "개인",
     "Users" : "사용자",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index ff183b6d4b7..d07d2abb861 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%sconfig 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.",
     "Sample configuration detected" : "예제 설정 감지됨",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "예제 설정이 복사된 것 같습니다. 올바르게 작동하지 않을 수도 있기 때문에 지원되지 않습니다. config.php를 변경하기 전 문서를 읽어 보십시오",
-    "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다",
     "PHP %s or higher is required." : "PHP 버전 %s 이상이 필요합니다.",
     "PHP with a version lower than %s is required." : "PHP 버전 %s 미만이 필요합니다.",
     "Following databases are supported: %s" : "다음 데이터베이스를 지원합니다: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "다음 플랫폼을 지원합니다: %s",
     "ownCloud %s or higher is required." : "ownCloud 버전 %s 이상이 필요합니다.",
     "ownCloud %s or lower is required." : "ownCloud %s 이하가 필요합니다.",
+    "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다",
     "Help" : "도움말",
     "Personal" : "개인",
     "Users" : "사용자",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index 7e1899464fc..bf36288b2c3 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til config-mappen%s.",
     "Sample configuration detected" : "Eksempelkonfigurasjon oppdaget",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det ble oppdaget at eksempelkonfigurasjonen er blitt kopiert. Dette kan ødelegge installasjonen din og støttes ikke. Les dokumentasjonen før du gjør endringer i config.php",
-    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
-    "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
-    "Expiration date is in the past" : "Utløpsdato er tilbake i tid",
-    "Cannot set expiration date more than %s days in the future" : "Kan ikke sette utløpsdato mer enn  %s dager fram i tid",
     "PHP %s or higher is required." : "PHP %s eller nyere kreves.",
     "PHP with a version lower than %s is required." : "PHP med en versjon lavere enn %s kreves.",
     "Following databases are supported: %s" : "Følgende databaser støttes: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Følgende plattformer støttes: %s",
     "ownCloud %s or higher is required." : "ownCloud %s eller høyere kreves.",
     "ownCloud %s or lower is required." : "ownCloud %s eller lavere kreves.",
+    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
+    "Expiration date is in the past" : "Utløpsdato er tilbake i tid",
+    "Cannot set expiration date more than %s days in the future" : "Kan ikke sette utløpsdato mer enn  %s dager fram i tid",
     "Help" : "Hjelp",
     "Personal" : "Personlig",
     "Users" : "Brukere",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index e198e9ffb34..f5ec1571e8e 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til config-mappen%s.",
     "Sample configuration detected" : "Eksempelkonfigurasjon oppdaget",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det ble oppdaget at eksempelkonfigurasjonen er blitt kopiert. Dette kan ødelegge installasjonen din og støttes ikke. Les dokumentasjonen før du gjør endringer i config.php",
-    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
-    "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
-    "Expiration date is in the past" : "Utløpsdato er tilbake i tid",
-    "Cannot set expiration date more than %s days in the future" : "Kan ikke sette utløpsdato mer enn  %s dager fram i tid",
     "PHP %s or higher is required." : "PHP %s eller nyere kreves.",
     "PHP with a version lower than %s is required." : "PHP med en versjon lavere enn %s kreves.",
     "Following databases are supported: %s" : "Følgende databaser støttes: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Følgende plattformer støttes: %s",
     "ownCloud %s or higher is required." : "ownCloud %s eller høyere kreves.",
     "ownCloud %s or lower is required." : "ownCloud %s eller lavere kreves.",
+    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
+    "Expiration date is in the past" : "Utløpsdato er tilbake i tid",
+    "Cannot set expiration date more than %s days in the future" : "Kan ikke sette utløpsdato mer enn  %s dager fram i tid",
     "Help" : "Hjelp",
     "Personal" : "Personlig",
     "Users" : "Brukere",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index e772d083dea..e7e445ac065 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s",
     "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
-    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
-    "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
-    "Expiration date is in the past" : "De vervaldatum ligt in het verleden",
-    "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
     "PHP %s or higher is required." : "PHP %s of hoger vereist.",
     "PHP with a version lower than %s is required." : "PHP met een versie lager dan %s is vereist.",
     "Following databases are supported: %s" : "De volgende databases worden ondersteund: %s",
@@ -21,11 +17,18 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "De volgende platformen worden ondersteund: %s",
     "ownCloud %s or higher is required." : "ownCloud %s of hoger vereist.",
     "ownCloud %s or lower is required." : "ownCloud %s of lager vereist.",
+    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
+    "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
+    "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijderrechten",
+    "Files can't be shared with create permissions" : "Bestanden kunnen niet worden gedeeld met creatie rechten",
+    "Expiration date is in the past" : "De vervaldatum ligt in het verleden",
+    "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
     "Help" : "Help",
     "Personal" : "Persoonlijk",
     "Users" : "Gebruikers",
     "Admin" : "Beheerder",
     "Recommended" : "Aanbevolen",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" kan niet worden geïnstalleerd, omdat het appinfo bestand niet gelezen kan worden.",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van ownCloud.",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld: %s",
     "No app name specified" : "Geen app naam opgegeven.",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index cc3e455e222..323076b5ab9 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s",
     "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
-    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
-    "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
-    "Expiration date is in the past" : "De vervaldatum ligt in het verleden",
-    "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
     "PHP %s or higher is required." : "PHP %s of hoger vereist.",
     "PHP with a version lower than %s is required." : "PHP met een versie lager dan %s is vereist.",
     "Following databases are supported: %s" : "De volgende databases worden ondersteund: %s",
@@ -19,11 +15,18 @@
     "Following platforms are supported: %s" : "De volgende platformen worden ondersteund: %s",
     "ownCloud %s or higher is required." : "ownCloud %s of hoger vereist.",
     "ownCloud %s or lower is required." : "ownCloud %s of lager vereist.",
+    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
+    "Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
+    "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijderrechten",
+    "Files can't be shared with create permissions" : "Bestanden kunnen niet worden gedeeld met creatie rechten",
+    "Expiration date is in the past" : "De vervaldatum ligt in het verleden",
+    "Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
     "Help" : "Help",
     "Personal" : "Persoonlijk",
     "Users" : "Gebruikers",
     "Admin" : "Beheerder",
     "Recommended" : "Aanbevolen",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" kan niet worden geïnstalleerd, omdat het appinfo bestand niet gelezen kan worden.",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van ownCloud.",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld: %s",
     "No app name specified" : "Geen app naam opgegeven.",
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index 26d31ab9353..186ddd154d7 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri de configuracion%s.",
     "Sample configuration detected" : "Configuracion d'exemple detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es estat detectat que la configuracion donada a títol d'exemple es estada copiada. Aquò pòt rendre vòstra installacion inoperanta e es pas pres en carga. Legissètz la documentacion abans d'efectuar de modifications dins config.php",
-    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
     "PHP %s or higher is required." : "PHP %s o superior es requesit.",
     "PHP with a version lower than %s is required." : "PHP amb una version anteriora a %s es requesit.",
     "Following databases are supported: %s" : "Les bases de donadas seguentas son suportadas : %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Las plataformas seguentas son presas en carga : %s",
     "ownCloud %s or higher is required." : "ownCloud %s o superior es requesit.",
     "ownCloud %s or lower is required." : "ownCloud %s o inferior es requesit.",
+    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
     "Help" : "Ajuda",
     "Personal" : "Personal",
     "Users" : "Utilizaires",
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index bbb6dbed4a0..68748d0236a 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri de configuracion%s.",
     "Sample configuration detected" : "Configuracion d'exemple detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es estat detectat que la configuracion donada a títol d'exemple es estada copiada. Aquò pòt rendre vòstra installacion inoperanta e es pas pres en carga. Legissètz la documentacion abans d'efectuar de modifications dins config.php",
-    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
     "PHP %s or higher is required." : "PHP %s o superior es requesit.",
     "PHP with a version lower than %s is required." : "PHP amb una version anteriora a %s es requesit.",
     "Following databases are supported: %s" : "Les bases de donadas seguentas son suportadas : %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Las plataformas seguentas son presas en carga : %s",
     "ownCloud %s or higher is required." : "ownCloud %s o superior es requesit.",
     "ownCloud %s or lower is required." : "ownCloud %s o inferior es requesit.",
+    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
     "Help" : "Ajuda",
     "Personal" : "Personal",
     "Users" : "Utilizaires",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index ba399f019ba..a63bfce1c60 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu config%s.",
     "Sample configuration detected" : "Wykryto przykładową konfigurację",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Wykryto skopiowanie przykładowej konfiguracji. To może popsuć Twoją instalację i nie jest wspierane. Proszę przeczytać dokumentację przed dokonywaniem zmian w config.php",
-    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
     "PHP %s or higher is required." : "PHP %s lub wyższe jest wymagane.",
     "PHP with a version lower than %s is required." : "Wersja PHP jest niższa niż %s, która jest wymagana.",
     "Following databases are supported: %s" : "Obsługiwane są następujące bazy danych: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s",
     "ownCloud %s or higher is required." : "ownCloud %s jest w wersji nowszej niż wymagana.",
     "ownCloud %s or lower is required." : "ownCloud %s jest w wersji starszej niż wymagana.",
+    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
     "Help" : "Pomoc",
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index d19dc2aa7b1..f968e0e45f2 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu config%s.",
     "Sample configuration detected" : "Wykryto przykładową konfigurację",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Wykryto skopiowanie przykładowej konfiguracji. To może popsuć Twoją instalację i nie jest wspierane. Proszę przeczytać dokumentację przed dokonywaniem zmian w config.php",
-    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
     "PHP %s or higher is required." : "PHP %s lub wyższe jest wymagane.",
     "PHP with a version lower than %s is required." : "Wersja PHP jest niższa niż %s, która jest wymagana.",
     "Following databases are supported: %s" : "Obsługiwane są następujące bazy danych: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s",
     "ownCloud %s or higher is required." : "ownCloud %s jest w wersji nowszej niż wymagana.",
     "ownCloud %s or lower is required." : "ownCloud %s jest w wersji starszej niż wymagana.",
+    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
     "Help" : "Pomoc",
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 1f2c517bfea..d567f8d8249 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isso geralmente pode ser corrigido dando permissão de gravação %sgiving ao webserver para o directory%s de configuração.",
     "Sample configuration detected" : "Exemplo de configuração detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração exemplo foi copiada. Isso pode desestabilizar sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
-    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
-    "Expiration date is in the past" : "Data de validade está ultrapassada",
-    "Cannot set expiration date more than %s days in the future" : "Não é possível definir a data de validade mais de %s dias no futuro",
     "PHP %s or higher is required." : "É requerido PHP %s ou superior.",
     "PHP with a version lower than %s is required." : "É requerida uma versão PHP mais antiga que a %s .",
     "Following databases are supported: %s" : "Following databases are supported: %s",
@@ -21,6 +17,12 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
     "ownCloud %s or higher is required." : "É necessário um ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "É necessário um ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
+    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
+    "Files can't be shared with delete permissions" : "Os arquivos não podem ser compartilhadas com permissões de exclusão",
+    "Files can't be shared with create permissions" : "Os arquivos não podem ser compartilhados com permissões de criação",
+    "Expiration date is in the past" : "Data de validade está ultrapassada",
+    "Cannot set expiration date more than %s days in the future" : "Não é possível definir a data de validade mais de %s dias no futuro",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Usuários",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 48cd31f22c5..eae95180a02 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isso geralmente pode ser corrigido dando permissão de gravação %sgiving ao webserver para o directory%s de configuração.",
     "Sample configuration detected" : "Exemplo de configuração detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração exemplo foi copiada. Isso pode desestabilizar sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
-    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
-    "Expiration date is in the past" : "Data de validade está ultrapassada",
-    "Cannot set expiration date more than %s days in the future" : "Não é possível definir a data de validade mais de %s dias no futuro",
     "PHP %s or higher is required." : "É requerido PHP %s ou superior.",
     "PHP with a version lower than %s is required." : "É requerida uma versão PHP mais antiga que a %s .",
     "Following databases are supported: %s" : "Following databases are supported: %s",
@@ -19,6 +15,12 @@
     "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
     "ownCloud %s or higher is required." : "É necessário um ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "É necessário um ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
+    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
+    "Files can't be shared with delete permissions" : "Os arquivos não podem ser compartilhadas com permissões de exclusão",
+    "Files can't be shared with create permissions" : "Os arquivos não podem ser compartilhados com permissões de criação",
+    "Expiration date is in the past" : "Data de validade está ultrapassada",
+    "Cannot set expiration date more than %s days in the future" : "Não é possível definir a data de validade mais de %s dias no futuro",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Usuários",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 7fc296f149f..aa80b307754 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isto pode ser resolvido normalmente %sdando priviégios de escrita no directório de configuração ao serviço web%s.",
     "Sample configuration detected" : "Exemplo de configuração detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
-    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
-    "Expiration date is in the past" : "A data de expiração está no passado",
-    "Cannot set expiration date more than %s days in the future" : "Não é possível definir data de expiração a mais de %s dias no futuro",
     "PHP %s or higher is required." : "Necessário PHP %s ou maior.",
     "PHP with a version lower than %s is required." : "É necessário um PHP com uma versão inferir a %s.",
     "Following databases are supported: %s" : "As seguintes bases de dados são suportadas: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
     "ownCloud %s or higher is required." : "É necessário ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "É necessário ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
+    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
+    "Expiration date is in the past" : "A data de expiração está no passado",
+    "Cannot set expiration date more than %s days in the future" : "Não é possível definir data de expiração a mais de %s dias no futuro",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index afeeabc4a29..2306fece4f2 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isto pode ser resolvido normalmente %sdando priviégios de escrita no directório de configuração ao serviço web%s.",
     "Sample configuration detected" : "Exemplo de configuração detectada",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
-    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
-    "Expiration date is in the past" : "A data de expiração está no passado",
-    "Cannot set expiration date more than %s days in the future" : "Não é possível definir data de expiração a mais de %s dias no futuro",
     "PHP %s or higher is required." : "Necessário PHP %s ou maior.",
     "PHP with a version lower than %s is required." : "É necessário um PHP com uma versão inferir a %s.",
     "Following databases are supported: %s" : "As seguintes bases de dados são suportadas: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "As seguintes plataformas são suportadas: %s",
     "ownCloud %s or higher is required." : "É necessário ownCloud %s ou superior.",
     "ownCloud %s or lower is required." : "É necessário ownCloud %s ou inferior.",
+    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
+    "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s",
+    "Expiration date is in the past" : "A data de expiração está no passado",
+    "Cannot set expiration date more than %s days in the future" : "Não é possível definir data de expiração a mais de %s dias no futuro",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index 888233d9bc6..cd2936ff5f4 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -4,11 +4,11 @@ OC.L10N.register(
     "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
     "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului",
     "See %s" : "Vezi %s",
-    "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
     "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s",
     "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s",
     "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.",
+    "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Help" : "Ajutor",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 1f75f4330ba..d01b154ae64 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -2,11 +2,11 @@
     "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
     "This can usually be fixed by giving the webserver write access to the config directory" : "Aceasta se poate repara de obicei prin permiterea accesului de scriere la dosarul de configurarea a webserverului",
     "See %s" : "Vezi %s",
-    "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
     "PHP with a version lower than %s is required." : "Este necesară o versiune PHP mai mică decât %s",
     "Following platforms are supported: %s" : "Sunt suportate următoarele platforme: %s",
     "ownCloud %s or higher is required." : "ownCloud %s sau mai mare este necesar.",
+    "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Help" : "Ajutor",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 9ba53d3ca98..bd293e455ae 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
     "Sample configuration detected" : "Обнаружена конфигурация из примера",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php",
-    "You are not allowed to share %s" : "Вам запрещено делиться %s",
-    "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s",
-    "Expiration date is in the past" : "Дата окончания срока действия уже прошла",
-    "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
     "PHP %s or higher is required." : "Требуется PHP %s или выше",
     "PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.",
     "Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Поддерживаются следующие платформы: %s",
     "ownCloud %s or higher is required." : "Требуется ownCloud %s или выше.",
     "ownCloud %s or lower is required." : "Требуется ownCloud версии %s или ниже.",
+    "You are not allowed to share %s" : "Вам запрещено делиться %s",
+    "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s",
+    "Expiration date is in the past" : "Дата окончания срока действия уже прошла",
+    "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
     "Help" : "Помощь",
     "Personal" : "Личное",
     "Users" : "Пользователи",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index de1892fea61..09ca4187b72 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить %sпредоставив веб-серверу права на запись в каталоге конфигурации%s.",
     "Sample configuration detected" : "Обнаружена конфигурация из примера",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Такая конфигурация не поддерживается и может повредить вашей системе. Прочтите документацию перед внесением изменений в файл config.php",
-    "You are not allowed to share %s" : "Вам запрещено делиться %s",
-    "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s",
-    "Expiration date is in the past" : "Дата окончания срока действия уже прошла",
-    "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
     "PHP %s or higher is required." : "Требуется PHP %s или выше",
     "PHP with a version lower than %s is required." : "Требуется версия PHP ниже %s.",
     "Following databases are supported: %s" : "Поддерживаются следующие СУБД: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Поддерживаются следующие платформы: %s",
     "ownCloud %s or higher is required." : "Требуется ownCloud %s или выше.",
     "ownCloud %s or lower is required." : "Требуется ownCloud версии %s или ниже.",
+    "You are not allowed to share %s" : "Вам запрещено делиться %s",
+    "Cannot increase permissions of %s" : "Невозможно увеличить права доступа для %s",
+    "Expiration date is in the past" : "Дата окончания срока действия уже прошла",
+    "Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
     "Help" : "Помощь",
     "Personal" : "Личное",
     "Users" : "Пользователи",
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index 1d4cc3b36b5..8b7a7fc6431 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
     "Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
-    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
     "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
     "PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.",
     "Following databases are supported: %s" : "Podporované sú tieto databázy: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
     "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
     "ownCloud %s or lower is required." : "Požadovaná verzia ownCloudu %s alebo nižšia.",
+    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
     "Help" : "Pomoc",
     "Personal" : "Osobné",
     "Users" : "Používatelia",
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 83af91cb38a..8b8b15316ea 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
     "Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
-    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
     "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
     "PHP with a version lower than %s is required." : "PHP je vyžadované vo vyššej verzii ako %s.",
     "Following databases are supported: %s" : "Podporované sú tieto databázy: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
     "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
     "ownCloud %s or lower is required." : "Požadovaná verzia ownCloudu %s alebo nižšia.",
+    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
     "Help" : "Pomoc",
     "Personal" : "Osobné",
     "Users" : "Používatelia",
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 47511d0c49e..aadb42d3fa5 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
     "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
-    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
-    "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
-    "Expiration date is in the past" : "Datum preteka je že mimo!",
-    "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
     "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
     "PHP with a version lower than %s is required." : "Zahtevana je različica PHP manj kot %s.",
     "Following databases are supported: %s" : "Podprte so navedene podatkovne zbirke: %s",
@@ -21,11 +17,18 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Podprta so okolja: %s",
     "ownCloud %s or higher is required." : "Zahtevana je različica ownCloud %s ali višja.",
     "ownCloud %s or lower is required." : "Zahtevana je različica ownCloud %s ali nižja.",
+    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
+    "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
+    "Expiration date is in the past" : "Datum preteka je že mimo!",
+    "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
     "Help" : "Pomoč",
     "Personal" : "Osebno",
     "Users" : "Uporabniki",
     "Admin" : "Skrbništvo",
     "Recommended" : "Priporočljivo",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programa \\\"%s\\\" ni mogoče namestiti, ker ni mogoče brati datoteke appinfo.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Programa \"%s\" ni mogoče namestiti, ker ni skladen s trenutno nameščeno različico oblaka ownCloud.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Programa \"%s\" ni mogoče namestiti zaradi nerešenih odvisnosti: %s",
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index be488a84000..0fc989dd17b 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
     "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
-    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
-    "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
-    "Expiration date is in the past" : "Datum preteka je že mimo!",
-    "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
     "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
     "PHP with a version lower than %s is required." : "Zahtevana je različica PHP manj kot %s.",
     "Following databases are supported: %s" : "Podprte so navedene podatkovne zbirke: %s",
@@ -19,11 +15,18 @@
     "Following platforms are supported: %s" : "Podprta so okolja: %s",
     "ownCloud %s or higher is required." : "Zahtevana je različica ownCloud %s ali višja.",
     "ownCloud %s or lower is required." : "Zahtevana je različica ownCloud %s ali nižja.",
+    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
+    "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
+    "Expiration date is in the past" : "Datum preteka je že mimo!",
+    "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
     "Help" : "Pomoč",
     "Personal" : "Osebno",
     "Users" : "Uporabniki",
     "Admin" : "Skrbništvo",
     "Recommended" : "Priporočljivo",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programa \\\"%s\\\" ni mogoče namestiti, ker ni mogoče brati datoteke appinfo.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Programa \"%s\" ni mogoče namestiti, ker ni skladen s trenutno nameščeno različico oblaka ownCloud.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Programa \"%s\" ni mogoče namestiti zaradi nerešenih odvisnosti: %s",
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index 54a162455c6..c27944f9ed1 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Zakonisht kjo mund të ndreqet duke %si akorduar shërbyesit web të drejta shkrimi mbi drejtorinë e formësimeve%s.",
     "Sample configuration detected" : "U gjet formësim shembull",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "U pa se është kopjuar shembulli për formësime. Kjo mund të prishë instalimin tuaj dhe nuk mbulohet. Ju lutemi, lexoni dokumentimin, përpara se të kryeni ndryshime te config.php",
-    "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët",
-    "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s",
-    "Expiration date is in the past" : "Data e skadimit bie në të kaluarën",
-    "Cannot set expiration date more than %s days in the future" : "S’mund të caktohet data e skadimit më shumë se %s ditë në të ardhmen",
     "PHP %s or higher is required." : "Lypse PHP %s ose më sipër.",
     "PHP with a version lower than %s is required." : "Lypset PHP me një version më të ulët se sa %s.",
     "Following databases are supported: %s" : "Mbulohen bazat vijuese të të dhënave: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Mbulohen platformat vijuese: %s",
     "ownCloud %s or higher is required." : "Lypset ownCloud %s ose më sipër.",
     "ownCloud %s or lower is required." : "Lypset ownCloud %s ose më poshtë.",
+    "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët",
+    "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s",
+    "Expiration date is in the past" : "Data e skadimit bie në të kaluarën",
+    "Cannot set expiration date more than %s days in the future" : "S’mund të caktohet data e skadimit më shumë se %s ditë në të ardhmen",
     "Help" : "Ndihmë",
     "Personal" : "Personale",
     "Users" : "Përdorues",
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index 09d48e8f52a..8f2d552c79a 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Zakonisht kjo mund të ndreqet duke %si akorduar shërbyesit web të drejta shkrimi mbi drejtorinë e formësimeve%s.",
     "Sample configuration detected" : "U gjet formësim shembull",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "U pa se është kopjuar shembulli për formësime. Kjo mund të prishë instalimin tuaj dhe nuk mbulohet. Ju lutemi, lexoni dokumentimin, përpara se të kryeni ndryshime te config.php",
-    "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët",
-    "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s",
-    "Expiration date is in the past" : "Data e skadimit bie në të kaluarën",
-    "Cannot set expiration date more than %s days in the future" : "S’mund të caktohet data e skadimit më shumë se %s ditë në të ardhmen",
     "PHP %s or higher is required." : "Lypse PHP %s ose më sipër.",
     "PHP with a version lower than %s is required." : "Lypset PHP me një version më të ulët se sa %s.",
     "Following databases are supported: %s" : "Mbulohen bazat vijuese të të dhënave: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Mbulohen platformat vijuese: %s",
     "ownCloud %s or higher is required." : "Lypset ownCloud %s ose më sipër.",
     "ownCloud %s or lower is required." : "Lypset ownCloud %s ose më poshtë.",
+    "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët",
+    "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s",
+    "Expiration date is in the past" : "Data e skadimit bie në të kaluarën",
+    "Cannot set expiration date more than %s days in the future" : "S’mund të caktohet data e skadimit më shumë se %s ditë në të ardhmen",
     "Help" : "Ndihmë",
     "Personal" : "Personale",
     "Users" : "Përdorues",
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index d7652c30f27..42b747f0405 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ово се обично може средити %sдавањем права веб серверу да пише у директоријум са подешавањима%s.",
     "Sample configuration detected" : "Откривен је узорак подешавања",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Откривено је да је узорак подешавања ископиран. Ово може покварити инсталацију и није подржано. Прочитајте документацију пре вршења промена у фајлу config.php",
-    "You are not allowed to share %s" : "Није вам дозвољено да делите %s",
     "PHP %s or higher is required." : "Потребан је ПХП %s или новији.",
     "PHP with a version lower than %s is required." : "Потребан је ПХП старији од %s.",
     "Following databases are supported: %s" : "Следеће базе података су подржане: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Следеће платформе су подржане: %s",
     "ownCloud %s or higher is required." : "оунКлауд %s или новији је потребан.",
     "ownCloud %s or lower is required." : "оунКлауд %s или старији је потребан.",
+    "You are not allowed to share %s" : "Није вам дозвољено да делите %s",
     "Help" : "Помоћ",
     "Personal" : "Лично",
     "Users" : "Корисници",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index 92e7246afec..360f7a7dba9 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ово се обично може средити %sдавањем права веб серверу да пише у директоријум са подешавањима%s.",
     "Sample configuration detected" : "Откривен је узорак подешавања",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Откривено је да је узорак подешавања ископиран. Ово може покварити инсталацију и није подржано. Прочитајте документацију пре вршења промена у фајлу config.php",
-    "You are not allowed to share %s" : "Није вам дозвољено да делите %s",
     "PHP %s or higher is required." : "Потребан је ПХП %s или новији.",
     "PHP with a version lower than %s is required." : "Потребан је ПХП старији од %s.",
     "Following databases are supported: %s" : "Следеће базе података су подржане: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Следеће платформе су подржане: %s",
     "ownCloud %s or higher is required." : "оунКлауд %s или новији је потребан.",
     "ownCloud %s or lower is required." : "оунКлауд %s или старији је потребан.",
+    "You are not allowed to share %s" : "Није вам дозвољено да делите %s",
     "Help" : "Помоћ",
     "Personal" : "Лично",
     "Users" : "Корисници",
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index 42478ab1256..9dc27ed8cf2 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till konfigurations-katalogen %s.",
     "Sample configuration detected" : "Exempel-konfiguration detekterad",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det har detekterats att exempel-konfigurationen har kopierats. Detta kan förstöra din installation och stöds ej. Vänligen läs dokumentationen innan ändringar på config.php utförs",
-    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
     "PHP %s or higher is required." : "PHP %s eller högre krävs.",
     "PHP with a version lower than %s is required." : "PHP med version lägre än %s krävs.",
     "Following databases are supported: %s" : "Följande databastyper stödjs: %s",
@@ -17,6 +16,7 @@ OC.L10N.register(
     "Library %s with a version lower than %s is required - available version %s." : "Bibliotek %s med version lägre än %s krävs - tillgänglig version %s.",
     "Following platforms are supported: %s" : "Följande plattformar stödjs: %s",
     "ownCloud %s or higher is required." : "ownCloud %s eller högre krävs.",
+    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
     "Help" : "Hjälp",
     "Personal" : "Personligt",
     "Users" : "Användare",
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index 6c5721789a2..f5c3948418d 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till konfigurations-katalogen %s.",
     "Sample configuration detected" : "Exempel-konfiguration detekterad",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det har detekterats att exempel-konfigurationen har kopierats. Detta kan förstöra din installation och stöds ej. Vänligen läs dokumentationen innan ändringar på config.php utförs",
-    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
     "PHP %s or higher is required." : "PHP %s eller högre krävs.",
     "PHP with a version lower than %s is required." : "PHP med version lägre än %s krävs.",
     "Following databases are supported: %s" : "Följande databastyper stödjs: %s",
@@ -15,6 +14,7 @@
     "Library %s with a version lower than %s is required - available version %s." : "Bibliotek %s med version lägre än %s krävs - tillgänglig version %s.",
     "Following platforms are supported: %s" : "Följande plattformar stödjs: %s",
     "ownCloud %s or higher is required." : "ownCloud %s eller högre krävs.",
+    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
     "Help" : "Hjälp",
     "Personal" : "Personligt",
     "Users" : "Användare",
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index 8159852b0a2..09739c87609 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "นี้มักจะสามารถแก้ไขโดย %s ให้สิทธิ์การเขียนของเว็บเซิร์ฟเวอร์ไปยังการตั้งค่าไดเรกทอรี %s",
     "Sample configuration detected" : "ตรวจพบการกำหนดค่าตัวอย่าง",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "ตรวจพบว่าการกำหนดค่าตัวอย่างที่ถูกคัดลอก นี้สามารถทำลายการติดตั้งของคุณและไม่ได้รับการสนับสนุน โปรดอ่านเอกสารก่อนที่จะดำเนินการเปลี่ยนแปลงใน config.php",
-    "You are not allowed to share %s" : "คุณยังไม่ได้รับอนุญาตให้แชร์ %s",
-    "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s",
-    "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา",
-    "Cannot set expiration date more than %s days in the future" : "ไม่สามารถกำหนดวันหมดอายุให้มากกว่า %s วันในอนาคต",
     "PHP %s or higher is required." : "จำเป็นต้องมี PHP รุ่น %s หรือที่สูงกว่า ",
     "PHP with a version lower than %s is required." : "PHP จะต้องมีรุ่นที่ต่ำกว่า %s",
     "Following databases are supported: %s" : "ฐานข้อมูลต่อไปนี้ได้รับการสนับสนุน: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "แพลตฟอร์มต่อไปนี้ได้รับการสนับสนุน: %s",
     "ownCloud %s or higher is required." : "จำเป็นต้องมี ownCloud รุ่น %s หรือรุ่นที่สูงกว่า",
     "ownCloud %s or lower is required." : "ต้องการ ownCloud %s หรือรุ่นที่ต่ำกว่า",
+    "You are not allowed to share %s" : "คุณยังไม่ได้รับอนุญาตให้แชร์ %s",
+    "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s",
+    "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา",
+    "Cannot set expiration date more than %s days in the future" : "ไม่สามารถกำหนดวันหมดอายุให้มากกว่า %s วันในอนาคต",
     "Help" : "ช่วยเหลือ",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index 86b875fe314..003f22c00ad 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "นี้มักจะสามารถแก้ไขโดย %s ให้สิทธิ์การเขียนของเว็บเซิร์ฟเวอร์ไปยังการตั้งค่าไดเรกทอรี %s",
     "Sample configuration detected" : "ตรวจพบการกำหนดค่าตัวอย่าง",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "ตรวจพบว่าการกำหนดค่าตัวอย่างที่ถูกคัดลอก นี้สามารถทำลายการติดตั้งของคุณและไม่ได้รับการสนับสนุน โปรดอ่านเอกสารก่อนที่จะดำเนินการเปลี่ยนแปลงใน config.php",
-    "You are not allowed to share %s" : "คุณยังไม่ได้รับอนุญาตให้แชร์ %s",
-    "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s",
-    "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา",
-    "Cannot set expiration date more than %s days in the future" : "ไม่สามารถกำหนดวันหมดอายุให้มากกว่า %s วันในอนาคต",
     "PHP %s or higher is required." : "จำเป็นต้องมี PHP รุ่น %s หรือที่สูงกว่า ",
     "PHP with a version lower than %s is required." : "PHP จะต้องมีรุ่นที่ต่ำกว่า %s",
     "Following databases are supported: %s" : "ฐานข้อมูลต่อไปนี้ได้รับการสนับสนุน: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "แพลตฟอร์มต่อไปนี้ได้รับการสนับสนุน: %s",
     "ownCloud %s or higher is required." : "จำเป็นต้องมี ownCloud รุ่น %s หรือรุ่นที่สูงกว่า",
     "ownCloud %s or lower is required." : "ต้องการ ownCloud %s หรือรุ่นที่ต่ำกว่า",
+    "You are not allowed to share %s" : "คุณยังไม่ได้รับอนุญาตให้แชร์ %s",
+    "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s",
+    "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีตที่ผ่านมา",
+    "Cannot set expiration date more than %s days in the future" : "ไม่สามารถกำหนดวันหมดอายุให้มากกว่า %s วันในอนาคต",
     "Help" : "ช่วยเหลือ",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index a829153eeef..62d2916bbd1 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu genellikle, %sweb sunucusuna config dizinine yazma erişimi verilerek%s çözülebilir",
     "Sample configuration detected" : "Örnek yapılandırma tespit edildi",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun",
-    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
-    "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor",
-    "Expiration date is in the past" : "Son kullanma tarihi geçmişte",
-    "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz",
     "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.",
     "PHP with a version lower than %s is required." : "PHP'nin %s sürümü öncesi gerekli.",
     "Following databases are supported: %s" : "Şu veritabanları desteklenmekte: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Aşağıdaki platformlar destekleniyor: %s",
     "ownCloud %s or higher is required." : "ownCloud %s veya daha üstü gerekli.",
     "ownCloud %s or lower is required." : "ownCloud %s veya daha düşük sürüm gerekli.",
+    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
+    "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor",
+    "Expiration date is in the past" : "Son kullanma tarihi geçmişte",
+    "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz",
     "Help" : "Yardım",
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index a5340ed3008..bfd94d21c11 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu genellikle, %sweb sunucusuna config dizinine yazma erişimi verilerek%s çözülebilir",
     "Sample configuration detected" : "Örnek yapılandırma tespit edildi",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun",
-    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
-    "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor",
-    "Expiration date is in the past" : "Son kullanma tarihi geçmişte",
-    "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz",
     "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.",
     "PHP with a version lower than %s is required." : "PHP'nin %s sürümü öncesi gerekli.",
     "Following databases are supported: %s" : "Şu veritabanları desteklenmekte: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "Aşağıdaki platformlar destekleniyor: %s",
     "ownCloud %s or higher is required." : "ownCloud %s veya daha üstü gerekli.",
     "ownCloud %s or lower is required." : "ownCloud %s veya daha düşük sürüm gerekli.",
+    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
+    "Cannot increase permissions of %s" : "%s izinleri yükseltilemiyor",
+    "Expiration date is in the past" : "Son kullanma tarihi geçmişte",
+    "Cannot set expiration date more than %s days in the future" : "Paylaşımların son kullanım süreleri, gelecekte %s günden fazla olamaz",
     "Help" : "Yardım",
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 860e1d1e68d..e3f5697124c 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -7,7 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
     "Sample configuration detected" : "Виявлено приклад конфігурації",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
-    "You are not allowed to share %s" : "Вам заборонено поширювати %s",
     "PHP %s or higher is required." : "Необхідно PHP %s або вище",
     "PHP with a version lower than %s is required." : "Потрібна версія PHP нижче %s ",
     "Following databases are supported: %s" : "Підтримуються наступні сервери баз даних: %s",
@@ -18,6 +17,7 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "Підтримуються наступні платформи: %s",
     "ownCloud %s or higher is required." : "Потрібен ownCloud %s або вище.",
     "ownCloud %s or lower is required." : "Потрібна версія %s ownCloud або нижча.",
+    "You are not allowed to share %s" : "Вам заборонено поширювати %s",
     "Help" : "Допомога",
     "Personal" : "Особисте",
     "Users" : "Користувачі",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index f27f8c56914..c5962f4814c 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -5,7 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
     "Sample configuration detected" : "Виявлено приклад конфігурації",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
-    "You are not allowed to share %s" : "Вам заборонено поширювати %s",
     "PHP %s or higher is required." : "Необхідно PHP %s або вище",
     "PHP with a version lower than %s is required." : "Потрібна версія PHP нижче %s ",
     "Following databases are supported: %s" : "Підтримуються наступні сервери баз даних: %s",
@@ -16,6 +15,7 @@
     "Following platforms are supported: %s" : "Підтримуються наступні платформи: %s",
     "ownCloud %s or higher is required." : "Потрібен ownCloud %s або вище.",
     "ownCloud %s or lower is required." : "Потрібна версія %s ownCloud або нижча.",
+    "You are not allowed to share %s" : "Вам заборонено поширювати %s",
     "Help" : "Допомога",
     "Personal" : "Особисте",
     "Users" : "Користувачі",
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index d87e1215caf..48c086e37e2 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -3,8 +3,8 @@ OC.L10N.register(
     {
     "Cannot write into \"config\" directory!" : "无法写入“config”目录！",
     "See %s" : "查看 %s",
-    "You are not allowed to share %s" : "您无权分享 %s",
     "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。",
+    "You are not allowed to share %s" : "您无权分享 %s",
     "Help" : "帮助",
     "Personal" : "个人",
     "Users" : "用户",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index e7726edb5a4..51a1280a07b 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -1,8 +1,8 @@
 { "translations": {
     "Cannot write into \"config\" directory!" : "无法写入“config”目录！",
     "See %s" : "查看 %s",
-    "You are not allowed to share %s" : "您无权分享 %s",
     "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。",
+    "You are not allowed to share %s" : "您无权分享 %s",
     "Help" : "帮助",
     "Personal" : "个人",
     "Users" : "用户",
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index d930f9e491c..13ebf305a9b 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -7,10 +7,6 @@ OC.L10N.register(
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
     "Sample configuration detected" : "偵測到範本設定",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
-    "You are not allowed to share %s" : "你不被允許分享 %s",
-    "Cannot increase permissions of %s" : "無法增加%s的權限",
-    "Expiration date is in the past" : "到期日是之前的時間",
-    "Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
     "PHP %s or higher is required." : "需要 PHP %s 或更高版本",
     "PHP with a version lower than %s is required." : "需要 PHP 版本低於 %s ",
     "Following databases are supported: %s" : "這些資料庫支援: %s",
@@ -21,6 +17,10 @@ OC.L10N.register(
     "Following platforms are supported: %s" : "這些平台支援: %s",
     "ownCloud %s or higher is required." : "需要ownCloud %s 或更高版本",
     "ownCloud %s or lower is required." : "需要ownCloud %s 或更低版本",
+    "You are not allowed to share %s" : "你不被允許分享 %s",
+    "Cannot increase permissions of %s" : "無法增加%s的權限",
+    "Expiration date is in the past" : "到期日是之前的時間",
+    "Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
     "Help" : "說明",
     "Personal" : "個人",
     "Users" : "使用者",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index a0a736744fd..12cdbc83466 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -5,10 +5,6 @@
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
     "Sample configuration detected" : "偵測到範本設定",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
-    "You are not allowed to share %s" : "你不被允許分享 %s",
-    "Cannot increase permissions of %s" : "無法增加%s的權限",
-    "Expiration date is in the past" : "到期日是之前的時間",
-    "Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
     "PHP %s or higher is required." : "需要 PHP %s 或更高版本",
     "PHP with a version lower than %s is required." : "需要 PHP 版本低於 %s ",
     "Following databases are supported: %s" : "這些資料庫支援: %s",
@@ -19,6 +15,10 @@
     "Following platforms are supported: %s" : "這些平台支援: %s",
     "ownCloud %s or higher is required." : "需要ownCloud %s 或更高版本",
     "ownCloud %s or lower is required." : "需要ownCloud %s 或更低版本",
+    "You are not allowed to share %s" : "你不被允許分享 %s",
+    "Cannot increase permissions of %s" : "無法增加%s的權限",
+    "Expiration date is in the past" : "到期日是之前的時間",
+    "Cannot set expiration date more than %s days in the future" : "無法設定到期日超過未來%s天",
     "Help" : "說明",
     "Personal" : "個人",
     "Users" : "使用者",
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index c33e5349f3b..e763364e148 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -27,22 +27,14 @@ namespace OC\App;
 use OCP\IURLGenerator;
 
 class InfoParser {
-	/**
-	 * @var \OC\HTTPHelper
-	 */
-	private $httpHelper;
 
-	/**
-	 * @var IURLGenerator
-	 */
+	/** @var IURLGenerator */
 	private $urlGenerator;
 
 	/**
-	 * @param \OC\HTTPHelper $httpHelper
 	 * @param IURLGenerator $urlGenerator
 	 */
-	public function __construct(\OC\HTTPHelper $httpHelper, IURLGenerator $urlGenerator) {
-		$this->httpHelper = $httpHelper;
+	public function __construct(IURLGenerator $urlGenerator) {
 		$this->urlGenerator = $urlGenerator;
 	}
 
@@ -68,23 +60,32 @@ class InfoParser {
 			return null;
 		}
 		if (!array_key_exists('info', $array)) {
-			$array['info'] = array();
+			$array['info'] = [];
 		}
 		if (!array_key_exists('remote', $array)) {
-			$array['remote'] = array();
+			$array['remote'] = [];
 		}
 		if (!array_key_exists('public', $array)) {
-			$array['public'] = array();
+			$array['public'] = [];
 		}
 		if (!array_key_exists('types', $array)) {
-			$array['types'] = array();
+			$array['types'] = [];
+		}
+		if (!array_key_exists('repair-steps', $array)) {
+			$array['repair-steps'] = [];
+		}
+		if (!array_key_exists('pre-migration', $array['repair-steps'])) {
+			$array['repair-steps']['pre-migration'] = [];
+		}
+		if (!array_key_exists('post-migration', $array['repair-steps'])) {
+			$array['repair-steps']['post-migration'] = [];
 		}
 
 		if (array_key_exists('documentation', $array) && is_array($array['documentation'])) {
 			foreach ($array['documentation'] as $key => $url) {
 				// If it is not an absolute URL we assume it is a key
 				// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-				if (!$this->httpHelper->isHTTPURL($url)) {
+				if (!$this->isHTTPURL($url)) {
 					$url = $this->urlGenerator->linkToDocs($url);
 				}
 
@@ -100,10 +101,15 @@ class InfoParser {
 					}
 				}
 			} else {
-				$array['types'] = array();
+				$array['types'] = [];
 			}
 		}
-
+		if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
+			$array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
+		}
+		if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
+			$array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
+		}
 		return $array;
 	}
 
@@ -116,7 +122,7 @@ class InfoParser {
 			return (string)$xml;
 		}
 
-		$array = array();
+		$array = [];
 		foreach ($xml->children() as $element => $node) {
 			$totalElement = count($xml->{$element});
 
@@ -129,9 +135,9 @@ class InfoParser {
 
 			// Has attributes
 			if ($attributes = $node->attributes()) {
-				$data = array(
-					'@attributes' => array(),
-				);
+				$data = [
+					'@attributes' => [],
+				];
 				if (!count($node->children())){
 					$value = (string)$node;
 					if (!empty($value)) {
@@ -161,4 +167,8 @@ class InfoParser {
 
 		return $array;
 	}
+
+	private function isHTTPURL($url) {
+		return stripos($url, 'https://') === 0 || stripos($url, 'http://') === 0;
+	}
 }
diff --git a/lib/private/console/application.php b/lib/private/Console/Application.php
index 7f12db4eca6..7f12db4eca6 100644
--- a/lib/private/console/application.php
+++ b/lib/private/Console/Application.php
diff --git a/lib/private/console/timestampformatter.php b/lib/private/Console/TimestampFormatter.php
index 3beac5e2f9f..3beac5e2f9f 100644
--- a/lib/private/console/timestampformatter.php
+++ b/lib/private/Console/TimestampFormatter.php
diff --git a/lib/private/diagnostics/event.php b/lib/private/Diagnostics/Event.php
index 8b5bb7e3bd8..8b5bb7e3bd8 100644
--- a/lib/private/diagnostics/event.php
+++ b/lib/private/Diagnostics/Event.php
diff --git a/lib/private/diagnostics/eventlogger.php b/lib/private/Diagnostics/EventLogger.php
index 3d909ce79cd..3d909ce79cd 100644
--- a/lib/private/diagnostics/eventlogger.php
+++ b/lib/private/Diagnostics/EventLogger.php
diff --git a/lib/private/diagnostics/nulleventlogger.php b/lib/private/Diagnostics/NullEventLogger.php
index 1b5e7af3ac9..1b5e7af3ac9 100644
--- a/lib/private/diagnostics/nulleventlogger.php
+++ b/lib/private/Diagnostics/NullEventLogger.php
diff --git a/lib/private/diagnostics/nullquerylogger.php b/lib/private/Diagnostics/NullQueryLogger.php
index 98ddef2e783..98ddef2e783 100644
--- a/lib/private/diagnostics/nullquerylogger.php
+++ b/lib/private/Diagnostics/NullQueryLogger.php
diff --git a/lib/private/diagnostics/query.php b/lib/private/Diagnostics/Query.php
index 567bc83ed4b..567bc83ed4b 100644
--- a/lib/private/diagnostics/query.php
+++ b/lib/private/Diagnostics/Query.php
diff --git a/lib/private/diagnostics/querylogger.php b/lib/private/Diagnostics/QueryLogger.php
index 66a65b71d04..66a65b71d04 100644
--- a/lib/private/diagnostics/querylogger.php
+++ b/lib/private/Diagnostics/QueryLogger.php
diff --git a/lib/private/integritycheck/checker.php b/lib/private/IntegrityCheck/Checker.php
index d7867936887..c3d6aefb829 100644
--- a/lib/private/integritycheck/checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -25,7 +25,7 @@ use OC\IntegrityCheck\Exceptions\InvalidSignatureException;
 use OC\IntegrityCheck\Helpers\AppLocator;
 use OC\IntegrityCheck\Helpers\EnvironmentHelper;
 use OC\IntegrityCheck\Helpers\FileAccessHelper;
-use OC\Integritycheck\Iterator\ExcludeFileByNameFilterIterator;
+use OC\IntegrityCheck\Iterator\ExcludeFileByNameFilterIterator;
 use OC\IntegrityCheck\Iterator\ExcludeFoldersByPathFilterIterator;
 use OCP\App\IAppManager;
 use OCP\ICache;
diff --git a/lib/private/integritycheck/exceptions/invalidsignatureexception.php b/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php
index 521171642b2..521171642b2 100644
--- a/lib/private/integritycheck/exceptions/invalidsignatureexception.php
+++ b/lib/private/IntegrityCheck/Exceptions/InvalidSignatureException.php
diff --git a/lib/private/integritycheck/helpers/applocator.php b/lib/private/IntegrityCheck/Helpers/AppLocator.php
index af22fca1fe4..af22fca1fe4 100644
--- a/lib/private/integritycheck/helpers/applocator.php
+++ b/lib/private/IntegrityCheck/Helpers/AppLocator.php
diff --git a/lib/private/integritycheck/helpers/environmenthelper.php b/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php
index f56f07486c2..f56f07486c2 100644
--- a/lib/private/integritycheck/helpers/environmenthelper.php
+++ b/lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php
diff --git a/lib/private/integritycheck/helpers/fileaccesshelper.php b/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php
index f0bf6576d35..f0bf6576d35 100644
--- a/lib/private/integritycheck/helpers/fileaccesshelper.php
+++ b/lib/private/IntegrityCheck/Helpers/FileAccessHelper.php
diff --git a/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php
index 51850852cbd..51850852cbd 100644
--- a/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php
+++ b/lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php
diff --git a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php
index 1082e97c296..1082e97c296 100644
--- a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php
+++ b/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php
diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php
index 9e97df44d3f..3a599a61e7d 100644
--- a/lib/private/Lock/DBLockingProvider.php
+++ b/lib/private/Lock/DBLockingProvider.php
@@ -24,7 +24,9 @@
 
 namespace OC\Lock;
 
+use OC\DB\QueryBuilder\Literal;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\ILogger;
 use OCP\Lock\ILockingProvider;
@@ -257,13 +259,22 @@ class DBLockingProvider extends AbstractLockingProvider {
 		parent::releaseAll();
 
 		// since we keep shared locks we need to manually clean those
-		foreach ($this->sharedLocks as $path => $lock) {
-			if ($lock) {
-				$this->connection->executeUpdate(
-					'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` - 1 WHERE `key` = ? AND `lock` > 0',
-					[$path]
-				);
-			}
+		$lockedPaths = array_keys($this->sharedLocks);
+		$lockedPaths = array_filter($lockedPaths, function ($path) {
+			return $this->sharedLocks[$path];
+		});
+
+		$chunkedPaths = array_chunk($lockedPaths, 100);
+
+		foreach ($chunkedPaths as $chunk) {
+			$builder = $this->connection->getQueryBuilder();
+
+			$query = $builder->update('file_locks')
+				->set('lock', $builder->createFunction('`lock` -1'))
+				->where($builder->expr()->in('key', $builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
+				->andWhere($builder->expr()->gt('lock', new Literal(0)));
+
+			$query->execute();
 		}
 	}
 }
diff --git a/lib/private/mail/mailer.php b/lib/private/Mail/Mailer.php
index 742ff554892..742ff554892 100644
--- a/lib/private/mail/mailer.php
+++ b/lib/private/Mail/Mailer.php
diff --git a/lib/private/mail/message.php b/lib/private/Mail/Message.php
index 0e33e6383f7..0e33e6383f7 100644
--- a/lib/private/mail/message.php
+++ b/lib/private/Mail/Message.php
diff --git a/lib/private/preview/bmp.php b/lib/private/Preview/BMP.php
index da13cd9e5b8..da13cd9e5b8 100644
--- a/lib/private/preview/bmp.php
+++ b/lib/private/Preview/BMP.php
diff --git a/lib/private/preview/bitmap.php b/lib/private/Preview/Bitmap.php
index 34bc2f93fc7..34bc2f93fc7 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/Preview/Bitmap.php
diff --git a/lib/private/preview/font.php b/lib/private/Preview/Font.php
index caac2923789..caac2923789 100644
--- a/lib/private/preview/font.php
+++ b/lib/private/Preview/Font.php
diff --git a/lib/private/preview/gif.php b/lib/private/Preview/GIF.php
index 0716a6f4406..0716a6f4406 100644
--- a/lib/private/preview/gif.php
+++ b/lib/private/Preview/GIF.php
diff --git a/lib/private/preview/illustrator.php b/lib/private/Preview/Illustrator.php
index ef8448d7b53..ef8448d7b53 100644
--- a/lib/private/preview/illustrator.php
+++ b/lib/private/Preview/Illustrator.php
diff --git a/lib/private/preview/image.php b/lib/private/Preview/Image.php
index 3ea99d6963a..3ea99d6963a 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/Preview/Image.php
diff --git a/lib/private/preview/jpeg.php b/lib/private/Preview/JPEG.php
index 2ee5dd24419..2ee5dd24419 100644
--- a/lib/private/preview/jpeg.php
+++ b/lib/private/Preview/JPEG.php
diff --git a/lib/private/preview/mp3.php b/lib/private/Preview/MP3.php
index c7b70457afe..c7b70457afe 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/Preview/MP3.php
diff --git a/lib/private/preview/msoffice2003.php b/lib/private/Preview/MSOffice2003.php
index 20dbe13543a..20dbe13543a 100644
--- a/lib/private/preview/msoffice2003.php
+++ b/lib/private/Preview/MSOffice2003.php
diff --git a/lib/private/preview/msoffice2007.php b/lib/private/Preview/MSOffice2007.php
index ef6758843f1..ef6758843f1 100644
--- a/lib/private/preview/msoffice2007.php
+++ b/lib/private/Preview/MSOffice2007.php
diff --git a/lib/private/preview/msofficedoc.php b/lib/private/Preview/MSOfficeDoc.php
index 05d839d508f..05d839d508f 100644
--- a/lib/private/preview/msofficedoc.php
+++ b/lib/private/Preview/MSOfficeDoc.php
diff --git a/lib/private/preview/markdown.php b/lib/private/Preview/MarkDown.php
index 394af6576c7..394af6576c7 100644
--- a/lib/private/preview/markdown.php
+++ b/lib/private/Preview/MarkDown.php
diff --git a/lib/private/preview/movie.php b/lib/private/Preview/Movie.php
index 43a8d674fc9..43a8d674fc9 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/Preview/Movie.php
diff --git a/lib/private/preview/office.php b/lib/private/Preview/Office.php
index 6496e091b1d..6496e091b1d 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/Preview/Office.php
diff --git a/lib/private/preview/opendocument.php b/lib/private/Preview/OpenDocument.php
index 0da1e88cafa..0da1e88cafa 100644
--- a/lib/private/preview/opendocument.php
+++ b/lib/private/Preview/OpenDocument.php
diff --git a/lib/private/preview/pdf.php b/lib/private/Preview/PDF.php
index 6ddf33cdea2..6ddf33cdea2 100644
--- a/lib/private/preview/pdf.php
+++ b/lib/private/Preview/PDF.php
diff --git a/lib/private/preview/png.php b/lib/private/Preview/PNG.php
index 5dd9ae484a5..5dd9ae484a5 100644
--- a/lib/private/preview/png.php
+++ b/lib/private/Preview/PNG.php
diff --git a/lib/private/preview/photoshop.php b/lib/private/Preview/Photoshop.php
index df91247f072..df91247f072 100644
--- a/lib/private/preview/photoshop.php
+++ b/lib/private/Preview/Photoshop.php
diff --git a/lib/private/preview/postscript.php b/lib/private/Preview/Postscript.php
index edfd43968c2..edfd43968c2 100644
--- a/lib/private/preview/postscript.php
+++ b/lib/private/Preview/Postscript.php
diff --git a/lib/private/preview/provider.php b/lib/private/Preview/Provider.php
index 738d13d7fc8..738d13d7fc8 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/Preview/Provider.php
diff --git a/lib/private/preview/svg.php b/lib/private/Preview/SVG.php
index 6618c1fbf82..6618c1fbf82 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/Preview/SVG.php
diff --git a/lib/private/preview/staroffice.php b/lib/private/Preview/StarOffice.php
index 6ea4efa5144..6ea4efa5144 100644
--- a/lib/private/preview/staroffice.php
+++ b/lib/private/Preview/StarOffice.php
diff --git a/lib/private/preview/tiff.php b/lib/private/Preview/TIFF.php
index 006ced6aec0..006ced6aec0 100644
--- a/lib/private/preview/tiff.php
+++ b/lib/private/Preview/TIFF.php
diff --git a/lib/private/preview/txt.php b/lib/private/Preview/TXT.php
index a27517c9f39..a27517c9f39 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/Preview/TXT.php
diff --git a/lib/private/preview/xbitmap.php b/lib/private/Preview/XBitmap.php
index 604a51a6a83..604a51a6a83 100644
--- a/lib/private/preview/xbitmap.php
+++ b/lib/private/Preview/XBitmap.php
diff --git a/lib/private/repair/assetcache.php b/lib/private/Repair/AssetCache.php
index 72fe99bbe1a..72fe99bbe1a 100644
--- a/lib/private/repair/assetcache.php
+++ b/lib/private/Repair/AssetCache.php
diff --git a/lib/private/repair/cleantags.php b/lib/private/Repair/CleanTags.php
index 537c4da78aa..537c4da78aa 100644
--- a/lib/private/repair/cleantags.php
+++ b/lib/private/Repair/CleanTags.php
diff --git a/lib/private/repair/collation.php b/lib/private/Repair/Collation.php
index 48035f8d331..48035f8d331 100644
--- a/lib/private/repair/collation.php
+++ b/lib/private/Repair/Collation.php
diff --git a/lib/private/repair/dropoldjobs.php b/lib/private/Repair/DropOldJobs.php
index 594af83e511..594af83e511 100644
--- a/lib/private/repair/dropoldjobs.php
+++ b/lib/private/Repair/DropOldJobs.php
diff --git a/lib/private/repair/dropoldtables.php b/lib/private/Repair/DropOldTables.php
index abd3bd49b0a..67eafaa930e 100644
--- a/lib/private/repair/dropoldtables.php
+++ b/lib/private/Repair/DropOldTables.php
@@ -92,6 +92,13 @@ class DropOldTables extends BasicEmitter implements RepairStep {
 			'principals',
 			'queuedtasks',
 			'sharing',
+			'clndr_calendars',
+			'clndr_objects',
+			'clndr_share_event',
+			'clndr_share_calendar',
+			'clndr_repeat',
+			'contacts_addressbooks',
+			'contacts_cards'
 		];
 	}
 }
diff --git a/lib/private/repair/filletags.php b/lib/private/Repair/FillETags.php
index dc2ffdcbc36..dc2ffdcbc36 100644
--- a/lib/private/repair/filletags.php
+++ b/lib/private/Repair/FillETags.php
diff --git a/lib/private/repair/innodb.php b/lib/private/Repair/InnoDB.php
index 4e157e66045..4e157e66045 100644
--- a/lib/private/repair/innodb.php
+++ b/lib/private/Repair/InnoDB.php
diff --git a/lib/private/repair/oldgroupmembershipshares.php b/lib/private/Repair/OldGroupMembershipShares.php
index 627645b116d..627645b116d 100644
--- a/lib/private/repair/oldgroupmembershipshares.php
+++ b/lib/private/Repair/OldGroupMembershipShares.php
diff --git a/lib/private/repair/preview.php b/lib/private/Repair/Preview.php
index 481e98b42d1..481e98b42d1 100644
--- a/lib/private/repair/preview.php
+++ b/lib/private/Repair/Preview.php
diff --git a/lib/private/repair/removegetetagentries.php b/lib/private/Repair/RemoveGetETagEntries.php
index e118da7973a..e118da7973a 100644
--- a/lib/private/repair/removegetetagentries.php
+++ b/lib/private/Repair/RemoveGetETagEntries.php
diff --git a/lib/private/repair/repairinvalidshares.php b/lib/private/Repair/RepairInvalidShares.php
index beef5e37798..beef5e37798 100644
--- a/lib/private/repair/repairinvalidshares.php
+++ b/lib/private/Repair/RepairInvalidShares.php
diff --git a/lib/private/repair/repairlegacystorages.php b/lib/private/Repair/RepairLegacyStorages.php
index ee189110a87..ee189110a87 100644
--- a/lib/private/repair/repairlegacystorages.php
+++ b/lib/private/Repair/RepairLegacyStorages.php
diff --git a/lib/private/repair/repairmimetypes.php b/lib/private/Repair/RepairMimeTypes.php
index c5180302443..c5180302443 100644
--- a/lib/private/repair/repairmimetypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
diff --git a/lib/private/repair/searchlucenetables.php b/lib/private/Repair/SearchLuceneTables.php
index 9f3601eeb03..9f3601eeb03 100644
--- a/lib/private/repair/searchlucenetables.php
+++ b/lib/private/Repair/SearchLuceneTables.php
diff --git a/lib/private/repair/sharepropagation.php b/lib/private/Repair/SharePropagation.php
index 26d7a9e128c..26d7a9e128c 100644
--- a/lib/private/repair/sharepropagation.php
+++ b/lib/private/Repair/SharePropagation.php
diff --git a/lib/private/repair/sqliteautoincrement.php b/lib/private/Repair/SqliteAutoincrement.php
index d7cac57229d..d7cac57229d 100644
--- a/lib/private/repair/sqliteautoincrement.php
+++ b/lib/private/Repair/SqliteAutoincrement.php
diff --git a/lib/private/repair/updatecertificatestore.php b/lib/private/Repair/UpdateCertificateStore.php
index ae7585f07f6..ae7585f07f6 100644
--- a/lib/private/repair/updatecertificatestore.php
+++ b/lib/private/Repair/UpdateCertificateStore.php
diff --git a/lib/private/repair/updateoutdatedocsids.php b/lib/private/Repair/UpdateOutdatedOcsIds.php
index 60024b3055c..60024b3055c 100644
--- a/lib/private/repair/updateoutdatedocsids.php
+++ b/lib/private/Repair/UpdateOutdatedOcsIds.php
diff --git a/lib/private/Security/Certificate.php b/lib/private/Security/Certificate.php
index 54486ff51fe..9aca278174e 100644
--- a/lib/private/Security/Certificate.php
+++ b/lib/private/Security/Certificate.php
@@ -50,6 +50,13 @@ class Certificate implements ICertificate {
 	public function __construct($data, $name) {
 		$this->name = $name;
 		$gmt = new \DateTimeZone('GMT');
+
+		// If string starts with "file://" ignore the certificate
+		$query = 'file://';
+		if(strtolower(substr($data, 0, strlen($query))) === $query) {
+			throw new \Exception('Certificate could not get parsed.');
+		}
+
 		$info = openssl_x509_parse($data);
 		if(!is_array($info)) {
 			throw new \Exception('Certificate could not get parsed.');
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/Setup/AbstractDatabase.php
index 90203b67c1d..90203b67c1d 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
diff --git a/lib/private/setup/mysql.php b/lib/private/Setup/MySQL.php
index ba1b2ca854c..18b6dab4ff8 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/Setup/MySQL.php
@@ -43,7 +43,7 @@ class MySQL extends AbstractDatabase {
 		$query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
 		$result = $connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
 		$row = $result->fetch();
-		if(!$result or $row[0]==0) {
+		if (!$row or $row['count(*)'] === '0') {
 			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
 		}
 	}
diff --git a/lib/private/setup/oci.php b/lib/private/Setup/OCI.php
index a398876ad16..a398876ad16 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/Setup/OCI.php
diff --git a/lib/private/setup/postgresql.php b/lib/private/Setup/PostgreSQL.php
index 893999bb0b9..893999bb0b9 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/Setup/PostgreSQL.php
diff --git a/lib/private/setup/sqlite.php b/lib/private/Setup/Sqlite.php
index 61bc501fd75..61bc501fd75 100644
--- a/lib/private/setup/sqlite.php
+++ b/lib/private/Setup/Sqlite.php
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index b1f3b4dab83..f0de39fdad3 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -910,4 +910,42 @@ class DefaultShareProvider implements IShareProvider {
 			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
 		$qb->execute();
 	}
+
+	/**
+	 * Delete custom group shares to this group for this user
+	 *
+	 * @param string $uid
+	 * @param string $gid
+	 */
+	public function userDeletedFromGroup($uid, $gid) {
+		/*
+		 * Get all group shares
+		 */
+		$qb = $this->dbConn->getQueryBuilder();
+		$qb->select('id')
+			->from('share')
+			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+		$cursor = $qb->execute();
+		$ids = [];
+		while($row = $cursor->fetch()) {
+			$ids[] = (int)$row['id'];
+		}
+		$cursor->closeCursor();
+
+		if (!empty($ids)) {
+			$chunks = array_chunk($ids, 100);
+			foreach ($chunks as $chunk) {
+				/*
+				 * Delete all special shares wit this users for the found group shares
+				 */
+				$qb->delete('share')
+					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+					->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
+					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+				$qb->execute();
+			}
+		}
+	}
 }
diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php
index b391ffce8d5..f29114a1b5d 100644
--- a/lib/private/Share20/Hooks.php
+++ b/lib/private/Share20/Hooks.php
@@ -28,4 +28,8 @@ class Hooks {
 	public static function post_deleteGroup($arguments) {
 		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
 	}
+
+	public static function post_removeFromGroup($arguments) {
+		\OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
+	}
 }
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 6f2efe167d4..dee9e0cdd21 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -237,6 +237,17 @@ class Manager implements IManager {
 		if (($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
 			throw new \InvalidArgumentException('Shares need at least read permissions');
 		}
+
+		if ($share->getNode() instanceof \OCP\Files\File) {
+			if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+				$message_t = $this->l->t('Files can\'t be shared with delete permissions');
+				throw new GenericShareException($message_t);
+			}
+			if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+				$message_t = $this->l->t('Files can\'t be shared with create permissions');
+				throw new GenericShareException($message_t);
+			}
+		}
 	}
 
 	/**
@@ -505,6 +516,24 @@ class Manager implements IManager {
 
 		$this->generalCreateChecks($share);
 
+		// Verify if there are any issues with the path
+		$this->pathCreateChecks($share->getNode());
+
+		/*
+		 * On creation of a share the owner is always the owner of the path
+		 * Except for mounted federated shares.
+		 */
+		$storage = $share->getNode()->getStorage();
+		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+			$parent = $share->getNode()->getParent();
+			while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+				$parent = $parent->getParent();
+			}
+			$share->setShareOwner($parent->getOwner()->getUID());
+		} else {
+			$share->setShareOwner($share->getNode()->getOwner()->getUID());
+		}
+
 		//Verify share type
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
 			$this->userCreateChecks($share);
@@ -538,24 +567,6 @@ class Manager implements IManager {
 			}
 		}
 
-		// Verify if there are any issues with the path
-		$this->pathCreateChecks($share->getNode());
-
-		/*
-		 * On creation of a share the owner is always the owner of the path
-		 * Except for mounted federated shares.
-		 */
-		$storage = $share->getNode()->getStorage();
-		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-			$parent = $share->getNode()->getParent();
-			while($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-				$parent = $parent->getParent();
-			}
-			$share->setShareOwner($parent->getOwner()->getUID());
-		} else {
-			$share->setShareOwner($share->getNode()->getOwner()->getUID());
-		}
-
 		// Cannot share with the owner
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
 			$share->getSharedWith() === $share->getShareOwner()) {
@@ -818,7 +829,7 @@ class Manager implements IManager {
 	 * @param string $recipientId
 	 */
 	public function deleteFromSelf(\OCP\Share\IShare $share, $recipientId) {
-		list($providerId, ) = $this->splitFullId($share->getId());
+		list($providerId, ) = $this->splitFullId($share->getFullId());
 		$provider = $this->factory->getProvider($providerId);
 
 		$provider->deleteFromSelf($share, $recipientId);
@@ -844,7 +855,7 @@ class Manager implements IManager {
 			}
 		}
 
-		list($providerId, ) = $this->splitFullId($share->getId());
+		list($providerId, ) = $this->splitFullId($share->getFullId());
 		$provider = $this->factory->getProvider($providerId);
 
 		$provider->move($share, $recipientId);
@@ -1057,6 +1068,14 @@ class Manager implements IManager {
 	}
 
 	/**
+	 * @inheritdoc
+	 */
+	public function userDeletedFromGroup($uid, $gid) {
+		$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_GROUP);
+		$provider->userDeletedFromGroup($uid, $gid);
+	}
+
+	/**
 	 * Get access list to a path. This means
 	 * all the users and groups that can access a given path.
 	 *
diff --git a/lib/private/tagging/tag.php b/lib/private/Tagging/Tag.php
index e35ac433e00..e35ac433e00 100644
--- a/lib/private/tagging/tag.php
+++ b/lib/private/Tagging/Tag.php
diff --git a/lib/private/tagging/tagmapper.php b/lib/private/Tagging/TagMapper.php
index 364dbc99b4d..364dbc99b4d 100644
--- a/lib/private/tagging/tagmapper.php
+++ b/lib/private/Tagging/TagMapper.php
diff --git a/lib/private/api.php b/lib/private/api.php
index 12a78f1424b..bab879c95f8 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -179,7 +179,7 @@ class OC_API {
 		$response = self::mergeResponses($responses);
 		$format = self::requestedFormat();
 		if (self::$logoutRequired) {
-			OC_User::logout();
+			\OC::$server->getUserSession()->logout();
 		}
 
 		self::respond($response, $format);
diff --git a/lib/private/app.php b/lib/private/app.php
index 05d220f7d38..7bcbef32531 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -47,6 +47,7 @@
 use OC\App\DependencyAnalyzer;
 use OC\App\Platform;
 use OC\OCSClient;
+use OC\Repair;
 
 /**
  * This class manages the apps. It allows them to register and integrate in the
@@ -159,8 +160,16 @@ class OC_App {
 	 * @param string $app app name
 	 */
 	private static function requireAppFile($app) {
-		// encapsulated here to avoid variable scope conflicts
-		require_once $app . '/appinfo/app.php';
+		try {
+			// encapsulated here to avoid variable scope conflicts
+			require_once $app . '/appinfo/app.php';
+		} catch (Error $ex) {
+			\OC::$server->getLogger()->logException($ex);
+			$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
+			if (!in_array($app, $blacklist)) {
+				self::disable($app);
+			}
+		}
 	}
 
 	/**
@@ -618,7 +627,7 @@ class OC_App {
 			$file = $appPath . '/appinfo/info.xml';
 		}
 
-		$parser = new \OC\App\InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+		$parser = new \OC\App\InfoParser(\OC::$server->getURLGenerator());
 		$data = $parser->parse($file);
 
 		if (is_array($data)) {
@@ -1023,7 +1032,6 @@ class OC_App {
 		if (!empty($requireMax)
 			&& version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
 		) {
-
 			return false;
 		}
 
@@ -1043,7 +1051,6 @@ class OC_App {
 		return $versions;
 	}
 
-
 	/**
 	 * @param string $app
 	 * @return bool
@@ -1140,9 +1147,12 @@ class OC_App {
 		if($appPath === false) {
 			return false;
 		}
+		$appData = self::getAppInfo($appId);
+		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
 		if (file_exists($appPath . '/appinfo/database.xml')) {
 			OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml');
 		}
+		self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
 		unset(self::$appVersion[$appId]);
 		// run upgrade code
 		if (file_exists($appPath . '/appinfo/update.php')) {
@@ -1151,7 +1161,6 @@ class OC_App {
 		}
 
 		//set remote/public handlers
-		$appData = self::getAppInfo($appId);
 		if (array_key_exists('ocsid', $appData)) {
 			\OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
 		} elseif(\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
@@ -1174,6 +1183,34 @@ class OC_App {
 
 	/**
 	 * @param string $appId
+	 * @param string[] $steps
+	 * @throws \OC\NeedsUpdateException
+	 */
+	private static function executeRepairSteps($appId, array $steps) {
+		if (empty($steps)) {
+			return;
+		}
+		// load the app
+		self::loadApp($appId, false);
+
+		$dispatcher = OC::$server->getEventDispatcher();
+
+		// load the steps
+		$r = new Repair([], $dispatcher);
+		foreach ($steps as $step) {
+			try {
+				$r->addStep($step);
+			} catch (Exception $ex) {
+				$r->emit('\OC\Repair', 'error', [$ex->getMessage()]);
+				\OC::$server->getLogger()->logException($ex);
+			}
+		}
+		// run the steps
+		$r->run();
+	}
+
+	/**
+	 * @param string $appId
 	 * @return \OC\Files\View|false
 	 */
 	public static function getStorage($appId) {
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index c8525d1d141..7cd8cedcfdd 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -368,7 +368,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	/**
 	 * Shortcut for getting cookie variables
 	 * @param string $key the key that will be taken from the $_COOKIE array
-	 * @return array the value in the $_COOKIE element
+	 * @return string the value in the $_COOKIE element
 	 */
 	public function getCookie($key) {
 		return isset($this->cookies[$key]) ? $this->cookies[$key] : null;
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index b8230fca4de..2429b830446 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -172,8 +172,8 @@ class JobList implements IJobList {
 		$query = $this->connection->getQueryBuilder();
 		$query->select('*')
 			->from('jobs')
-			->where($query->expr()->gt('id', $query->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
-			->orderBy('id', 'ASC')
+			->where($query->expr()->lt('id', $query->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
+			->orderBy('id', 'DESC')
 			->setMaxResults(1);
 		$result = $query->execute();
 		$row = $result->fetch();
@@ -187,7 +187,7 @@ class JobList implements IJobList {
 			$query = $this->connection->getQueryBuilder();
 			$query->select('*')
 				->from('jobs')
-				->orderBy('id', 'ASC')
+				->orderBy('id', 'DESC')
 				->setMaxResults(1);
 			$result = $query->execute();
 			$row = $result->fetch();
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index d45bbf07ee9..8714d161807 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -117,6 +117,25 @@ class Manager implements IManager {
 	}
 
 	/**
+	 * @param string $user
+	 */
+	public function isReadyForUser($user) {
+		if (!$this->isReady()) {
+			return false;
+		}
+
+		foreach ($this->getEncryptionModules() as $module) {
+			/** @var IEncryptionModule $m */
+			$m = call_user_func($module['callback']);
+			if (!$m->isReadyForUser($user)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+		/**
 	 * Registers an callback function which must return an encryption module instance
 	 *
 	 * @param string $id
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 5ca32548fe0..c16e8515b01 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -195,6 +195,8 @@ class Scanner extends BasicEmitter implements IScanner {
 					$fileId = -1;
 				}
 				if (!empty($newData)) {
+					// Reset the checksum if the data has changed
+					$newData['checksum'] = '';
 					$data['fileid'] = $this->addToCache($file, $newData, $fileId);
 				}
 				if (isset($cacheData['size'])) {
diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php
index 868e63cdf81..88b0f23a1fc 100644
--- a/lib/private/files/cache/wrapper/cachejail.php
+++ b/lib/private/files/cache/wrapper/cachejail.php
@@ -281,4 +281,20 @@ class CacheJail extends CacheWrapper {
 		$path = $this->cache->getPathById($id);
 		return $this->getJailedPath($path);
 	}
+
+	/**
+	 * Move a file or folder in the cache
+	 *
+	 * Note that this should make sure the entries are removed from the source cache
+	 *
+	 * @param \OCP\Files\Cache\ICache $sourceCache
+	 * @param string $sourcePath
+	 * @param string $targetPath
+	 */
+	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+		if ($sourceCache === $this) {
+			return $this->move($sourcePath, $targetPath);
+		}
+		return $this->cache->moveFromCache($sourceCache, $sourcePath, $targetPath);
+	}
 }
diff --git a/lib/private/files/config/cachedmountinfo.php b/lib/private/files/config/cachedmountinfo.php
index 2993c979a7f..ce75cb66896 100644
--- a/lib/private/files/config/cachedmountinfo.php
+++ b/lib/private/files/config/cachedmountinfo.php
@@ -30,22 +30,22 @@ class CachedMountInfo implements ICachedMountInfo {
 	/**
 	 * @var IUser
 	 */
-	private $user;
+	protected $user;
 
 	/**
 	 * @var int
 	 */
-	private $storageId;
+	protected $storageId;
 
 	/**
 	 * @var int
 	 */
-	private $rootId;
+	protected $rootId;
 
 	/**
 	 * @var string
 	 */
-	private $mountPoint;
+	protected $mountPoint;
 
 	/**
 	 * CachedMountInfo constructor.
@@ -88,9 +88,9 @@ class CachedMountInfo implements ICachedMountInfo {
 	 */
 	public function getMountPointNode() {
 		// TODO injection etc
-		Filesystem::initMountPoints($this->user->getUID());
-		$userNode = \OC::$server->getUserFolder($this->user->getUID());
-		$nodes = $userNode->getById($this->rootId);
+		Filesystem::initMountPoints($this->getUser()->getUID());
+		$userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
+		$nodes = $userNode->getById($this->getRootId());
 		if (count($nodes) > 0) {
 			return $nodes[0];
 		} else {
diff --git a/lib/private/files/config/lazystoragemountinfo.php b/lib/private/files/config/lazystoragemountinfo.php
new file mode 100644
index 00000000000..654c5b2b23e
--- /dev/null
+++ b/lib/private/files/config/lazystoragemountinfo.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Files\Config;
+
+use OC\Files\Filesystem;
+use OCP\Files\Config\ICachedMountInfo;
+use OCP\Files\Mount\IMountPoint;
+use OCP\Files\Node;
+use OCP\IUser;
+
+class LazyStorageMountInfo extends CachedMountInfo {
+	/** @var IMountPoint  */
+	private $mount;
+
+	/**
+	 * CachedMountInfo constructor.
+	 *
+	 * @param IUser $user
+	 * @param IMountPoint $mount
+	 */
+	public function __construct(IUser $user, IMountPoint $mount) {
+		$this->user = $user;
+		$this->mount = $mount;
+	}
+
+	/**
+	 * @return int the numeric storage id of the mount
+	 */
+	public function getStorageId() {
+		if (!$this->storageId) {
+			$this->storageId = $this->mount->getStorage()->getStorageCache()->getNumericId();
+		}
+		return parent::getStorageId();
+	}
+
+	/**
+	 * @return int the fileid of the root of the mount
+	 */
+	public function getRootId() {
+		if (!$this->rootId) {
+			$this->rootId = $this->mount->getStorageRootId();
+		}
+		return parent::getRootId();
+	}
+
+	/**
+	 * @return string the mount point of the mount for the user
+	 */
+	public function getMountPoint() {
+		if (!$this->mountPoint) {
+			$this->mountPoint = $this->mount->getMountPoint();
+		}
+		return parent::getMountPoint();
+	}
+}
diff --git a/lib/private/files/config/usermountcache.php b/lib/private/files/config/usermountcache.php
index 78b19972787..05ca146f4be 100644
--- a/lib/private/files/config/usermountcache.php
+++ b/lib/private/files/config/usermountcache.php
@@ -80,18 +80,11 @@ class UserMountCache implements IUserMountCache {
 		});
 		/** @var ICachedMountInfo[] $newMounts */
 		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
-			$storage = $mount->getStorage();
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
-				$rootId = (int)$storage->getShare()['file_source'];
-			} else {
-				$rootId = (int)$storage->getCache()->getId('');
-			}
-			$storageId = (int)$storage->getStorageCache()->getNumericId();
 			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
-			if ($rootId === -1) {
+			if ($mount->getStorageRootId() === -1) {
 				return null;
 			} else {
-				return new CachedMountInfo($user, $storageId, $rootId, $mount->getMountPoint());
+				return new LazyStorageMountInfo($user, $mount);
 			}
 		}, $mounts);
 		$newMounts = array_values(array_filter($newMounts));
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index a9138b0d2d7..ec9b537a358 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -372,6 +372,9 @@ class Filesystem {
 		if ($user == '') {
 			$user = \OC_User::getUser();
 		}
+		if ($user === null || $user === false || $user === '') {
+			throw new \OC\User\NoUserException('Attempted to initialize mount points for null user and no user in session');
+		}
 		if (isset(self::$usersSetup[$user])) {
 			return;
 		}
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php
index b606c625cb1..7b9294fc1e0 100644
--- a/lib/private/files/mount/mountpoint.php
+++ b/lib/private/files/mount/mountpoint.php
@@ -239,4 +239,13 @@ class MountPoint implements IMountPoint {
 	public function getOptions() {
 		return $this->mountOptions;
 	}
+
+	/**
+	 * Get the file id of the root of the storage
+	 *
+	 * @return int
+	 */
+	public function getStorageRootId() {
+		return (int)$this->getStorage()->getCache()->getId('');
+	}
 }
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 85c2e1c6700..3a811b312c6 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -313,20 +313,20 @@ abstract class Common implements Storage, ILockingStorage {
 		if (!$storage) {
 			$storage = $this;
 		}
-		if (!isset($this->cache)) {
-			$this->cache = new Cache($storage);
+		if (!isset($storage->cache)) {
+			$storage->cache = new Cache($storage);
 		}
-		return $this->cache;
+		return $storage->cache;
 	}
 
 	public function getScanner($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		if (!isset($this->scanner)) {
-			$this->scanner = new Scanner($storage);
+		if (!isset($storage->scanner)) {
+			$storage->scanner = new Scanner($storage);
 		}
-		return $this->scanner;
+		return $storage->scanner;
 	}
 
 	public function getWatcher($path = '', $storage = null) {
@@ -351,20 +351,20 @@ abstract class Common implements Storage, ILockingStorage {
 		if (!$storage) {
 			$storage = $this;
 		}
-		if (!isset($this->propagator)) {
-			$this->propagator = new Propagator($storage);
+		if (!isset($storage->propagator)) {
+			$storage->propagator = new Propagator($storage);
 		}
-		return $this->propagator;
+		return $storage->propagator;
 	}
 
 	public function getUpdater($storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		if (!isset($this->updater)) {
-			$this->updater = new Updater($storage);
+		if (!isset($storage->updater)) {
+			$storage->updater = new Updater($storage);
 		}
-		return $this->updater;
+		return $storage->updater;
 	}
 
 	public function getStorageCache($storage = null) {
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 1add4d7fd0a..02da978a700 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -627,9 +627,10 @@ class Encryption extends Wrapper {
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
 	 * @param bool $preserveMtime
+	 * @param bool $isRename
 	 * @return bool
 	 */
-	public function copyFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+	public function copyFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false, $isRename = false) {
 
 		// TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed:
 		// - call $this->storage->copyFromStorage() instead of $this->copyBetweenStorage
@@ -637,7 +638,7 @@ class Encryption extends Wrapper {
 		// - copy the copyKeys() call from  $this->copyBetweenStorage to this method
 		// - remove $this->copyBetweenStorage
 
-		return $this->copyBetweenStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, false);
+		return $this->copyBetweenStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename);
 	}
 
 	/**
@@ -732,7 +733,7 @@ class Encryption extends Wrapper {
 			if (is_resource($dh)) {
 				while ($result and ($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {
-						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file);
+						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file, false, $isRename);
 					}
 				}
 			}
diff --git a/lib/private/files/storage/wrapper/jail.php b/lib/private/files/storage/wrapper/jail.php
index e5f5ab90359..e8063f670c5 100644
--- a/lib/private/files/storage/wrapper/jail.php
+++ b/lib/private/files/storage/wrapper/jail.php
@@ -47,7 +47,7 @@ class Jail extends Wrapper {
 		$this->rootPath = $arguments['root'];
 	}
 
-	protected function getSourcePath($path) {
+	public function getSourcePath($path) {
 		if ($path === '') {
 			return $this->rootPath;
 		} else {
@@ -417,6 +417,14 @@ class Jail extends Wrapper {
 
 	/**
 	 * @param string $path
+	 * @return array
+	 */
+	public function getMetaData($path) {
+		return $this->storage->getMetaData($this->getSourcePath($path));
+	}
+
+	/**
+	 * @param string $path
 	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
 	 * @param \OCP\Lock\ILockingProvider $provider
 	 * @throws \OCP\Lock\LockedException
@@ -442,4 +450,40 @@ class Jail extends Wrapper {
 	public function changeLock($path, $type, ILockingProvider $provider) {
 		$this->storage->changeLock($this->getSourcePath($path), $type, $provider);
 	}
+
+	/**
+	 * Resolve the path for the source of the share
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function resolvePath($path) {
+		return [$this->storage, $this->getSourcePath($path)];
+	}
+
+	/**
+	 * @param \OCP\Files\Storage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 */
+	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		if ($sourceStorage === $this) {
+			return $this->copy($sourceInternalPath, $targetInternalPath);
+		}
+		return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
+	}
+
+	/**
+	 * @param \OCP\Files\Storage $sourceStorage
+	 * @param string $sourceInternalPath
+	 * @param string $targetInternalPath
+	 * @return bool
+	 */
+	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		if ($sourceStorage === $this) {
+			return $this->rename($sourceInternalPath, $targetInternalPath);
+		}
+		return $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));
+	}
 }
diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index 12914e7a1b8..21d7db1099b 100644
--- a/lib/private/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
@@ -35,6 +35,12 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage {
 	 */
 	protected $storage;
 
+	public $cache;
+	public $scanner;
+	public $watcher;
+	public $propagator;
+	public $updater;
+
 	/**
 	 * @param array $parameters
 	 */
diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php
deleted file mode 100644
index 74a19a90592..00000000000
--- a/lib/private/group/dummy.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
- * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * dummy group backend, does not keep state, only for testing use
- */
-class OC_Group_Dummy extends OC_Group_Backend {
-	private $groups=array();
-	/**
-	 * Try to create a new group
-	 * @param string $gid The name of the group to create
-	 * @return bool
-	 *
-	 * Tries to create a new group. If the group name already exists, false will
-	 * be returned.
-	 */
-	public function createGroup($gid) {
-		if(!isset($this->groups[$gid])) {
-			$this->groups[$gid]=array();
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * delete a group
-	 * @param string $gid gid of the group to delete
-	 * @return bool
-	 *
-	 * Deletes a group and removes it from the group_user-table
-	 */
-	public function deleteGroup($gid) {
-		if(isset($this->groups[$gid])) {
-			unset($this->groups[$gid]);
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid) {
-		if(isset($this->groups[$gid])) {
-			return (array_search($uid, $this->groups[$gid])!==false);
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Add a user to a group
-	 * @param string $uid Name of the user to add to group
-	 * @param string $gid Name of the group in which add the user
-	 * @return bool
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup($uid, $gid) {
-		if(isset($this->groups[$gid])) {
-			if(array_search($uid, $this->groups[$gid])===false) {
-				$this->groups[$gid][]=$uid;
-				return true;
-			}else{
-				return false;
-			}
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Removes a user from a group
-	 * @param string $uid Name of the user to remove from group
-	 * @param string $gid Name of the group from which remove the user
-	 * @return bool
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup($uid, $gid) {
-		if(isset($this->groups[$gid])) {
-			if(($index=array_search($uid, $this->groups[$gid]))!==false) {
-				unset($this->groups[$gid][$index]);
-				return true;
-			}else{
-				return false;
-			}
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid) {
-		$groups=array();
-		$allGroups=array_keys($this->groups);
-		foreach($allGroups as $group) {
-			if($this->inGroup($uid, $group)) {
-				$groups[]=$group;
-			}
-		}
-		return $groups;
-	}
-
-	/**
-	 * Get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 */
-	public function getGroups($search = '', $limit = -1, $offset = 0) {
-		if(empty($search)) {
-			return array_keys($this->groups);
-		}
-		$result = array();
-		foreach(array_keys($this->groups) as $group) {
-			if(stripos($group, $search) !== false) {
-				$result[] = $group;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of user IDs
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		if(isset($this->groups[$gid])) {
-			if(empty($search)) {
-				return $this->groups[$gid];
-			}
-			$result = array();
-			foreach($this->groups[$gid] as $user) {
-				if(stripos($user, $search) !== false) {
-					$result[] = $user;
-				}
-			}
-			return $result;
-		}else{
-			return array();
-		}
-	}
-
-	/**
-	 * get the number of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return int
-	 */
-	public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		if(isset($this->groups[$gid])) {
-			if(empty($search)) {
-				return count($this->groups[$gid]);
-			}
-			$count = 0;
-			foreach($this->groups[$gid] as $user) {
-				if(stripos($user, $search) !== false) {
-					$count++;
-				}
-			}
-			return $count;
-		}
-	}
-
-}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 70c50bb7b4b..e6aaed0fd15 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -628,7 +628,7 @@ class OC_Helper {
 			/** @var \OC\Files\Storage\Wrapper\Quota $storage */
 			$quota = $sourceStorage->getQuota();
 		}
-		$free = $storage->free_space('');
+		$free = $sourceStorage->free_space('');
 		if ($free >= 0) {
 			$total = $free + $used;
 		} else {
diff --git a/lib/private/log.php b/lib/private/log.php
index 9a2a2da906e..bbdad9cf166 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -270,12 +270,12 @@ class Log implements ILogger {
 	/**
 	 * Logs an exception very detailed
 	 *
-	 * @param \Exception $exception
+	 * @param \Exception | \Throwable $exception
 	 * @param array $context
 	 * @return void
 	 * @since 8.2.0
 	 */
-	public function logException(\Exception $exception, array $context = array()) {
+	public function logException($exception, array $context = array()) {
 		$exception = array(
 			'Exception' => get_class($exception),
 			'Message' => $exception->getMessage(),
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 27cde4aa242..8899bcfcb03 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -44,6 +44,9 @@ class ErrorHandler {
 
 		if ($debug) {
 			set_error_handler(array($handler, 'onAll'), E_ALL);
+			if (\OC::$CLI) {
+				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+			}
 		} else {
 			set_error_handler(array($handler, 'onError'));
 		}
diff --git a/lib/private/repair.php b/lib/private/repair.php
index 779f09d42ec..28fe993db07 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -46,20 +46,24 @@ use OC\Repair\RepairMimeTypes;
 use OC\Repair\SearchLuceneTables;
 use OC\Repair\UpdateOutdatedOcsIds;
 use OC\Repair\RepairInvalidShares;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends BasicEmitter {
-	/**
-	 * @var RepairStep[]
-	 **/
+	/* @var RepairStep[] */
 	private $repairSteps;
+	/** @var EventDispatcher */
+	private $dispatcher;
 
 	/**
 	 * Creates a new repair step runner
 	 *
-	 * @param array $repairSteps array of RepairStep instances
+	 * @param RepairStep[] $repairSteps array of RepairStep instances
+	 * @param EventDispatcher $dispatcher
 	 */
-	public function __construct($repairSteps = array()) {
+	public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
 		$this->repairSteps = $repairSteps;
+		$this->dispatcher = $dispatcher;
 	}
 
 	/**
@@ -91,10 +95,24 @@ class Repair extends BasicEmitter {
 	/**
 	 * Add repair step
 	 *
-	 * @param RepairStep $repairStep repair step
+	 * @param RepairStep|string $repairStep repair step
+	 * @throws \Exception
 	 */
 	public function addStep($repairStep) {
-		$this->repairSteps[] = $repairStep;
+		if (is_string($repairStep)) {
+			if (class_exists($repairStep)) {
+				$s = new $repairStep();
+				if ($s instanceof RepairStep) {
+					$this->repairSteps[] = $s;
+				} else {
+					throw new \Exception("Repair step '$repairStep' is not of type \\OC\\RepairStep");
+				}
+			} else {
+				throw new \Exception("Repair step '$repairStep' is unknown");
+			}
+		} else {
+			$this->repairSteps[] = $repairStep;
+		}
 	}
 
 	/**
@@ -159,10 +177,12 @@ class Repair extends BasicEmitter {
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * Re-declared as public to allow invocation from within the closure above in php 5.3
 	 */
-	public function emit($scope, $method, array $arguments = array()) {
+	public function emit($scope, $method, array $arguments = []) {
 		parent::emit($scope, $method, $arguments);
+		if (!is_null($this->dispatcher)) {
+			$this->dispatcher->dispatch("$scope::$method",
+				new GenericEvent("$scope::$method", $arguments));
+		}
 	}
 }
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 6303d0d47f3..d2f3802ebad 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -400,12 +400,21 @@ class Setup {
 	 * Append the correct ErrorDocument path for Apache hosts
 	 */
 	public static function updateHtaccess() {
-		// From CLI we don't know the defined web root. Thus we can't write any
-		// directives into the .htaccess file.
+		$config = \OC::$server->getConfig();
+
+		// For CLI read the value from overwrite.cli.url
 		if(\OC::$CLI) {
-			return;
+			$webRoot = $config->getSystemValue('overwrite.cli.url', '');
+			if($webRoot === '') {
+				return;
+			}
+			$webRoot = parse_url($webRoot, PHP_URL_PATH);
+			$webRoot = rtrim($webRoot, '/');
+		} else {
+			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
 		}
-		$setupHelper = new \OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
+
+		$setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(),
 			\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
 			\OC::$server->getSecureRandom());
 
@@ -413,13 +422,12 @@ class Setup {
 		$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
 		if(strpos($htaccessContent, $content) === false) {
 			//custom 403 error page
-			$content.= "\nErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php";
+			$content.= "\nErrorDocument 403 ".$webRoot."/core/templates/403.php";
 
 			//custom 404 error page
-			$content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";
+			$content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php";
 
 			// Add rewrite base
-			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
 			$content .= "\n<IfModule mod_rewrite.c>";
 			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
 			$content .= "\n  RewriteBase ".$webRoot;
diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php
deleted file mode 100644
index 5faf81c5e9b..00000000000
--- a/lib/private/share/hooks.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <rullzer@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Share;
-
-class Hooks extends \OC\Share\Constants {
-	/**
-	 * Function that is called after a user is removed from a group. Shares are cleaned up.
-	 * @param array $arguments
-	 */
-	public static function post_removeFromGroup($arguments) {
-		$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
-			.' WHERE (`share_type` = ? AND `share_with` = ?) OR (`share_type` = ? AND `share_with` = ?)';
-		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid'],
-			self::$shareTypeGroupUserUnique, $arguments['uid']));
-		while ($item = $result->fetchRow()) {
-			if ($item['share_type'] == self::SHARE_TYPE_GROUP) {
-				// Delete all reshares by this user of the group share
-				Helper::delete($item['id'], true, $arguments['uid']);
-			} else {
-				Helper::delete($item['id']);
-			}
-		}
-	}
-}
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 2125767cabb..5b61f418a4d 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -90,6 +90,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialoglinkshareview');
+					\OC_Util::addScript('core', 'sharedialogmailview');
 					\OC_Util::addScript('core', 'sharedialogexpirationview');
 					\OC_Util::addScript('core', 'sharedialogshareelistview');
 					\OC_Util::addScript('core', 'sharedialogview');
diff --git a/lib/private/template.php b/lib/private/template.php
index c6542356fac..73725529702 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -333,7 +333,7 @@ class OC_Template extends \OC\Template\Base {
 
 	/**
 	 * print error page using Exception details
-	 * @param Exception $exception
+	 * @param Exception | Throwable $exception
 	 */
 	public static function printExceptionErrorPage($exception, $fetchPage = false) {
 		try {
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 0d567b8dfb9..66f410b779f 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -37,10 +37,10 @@ use OC\Hooks\BasicEmitter;
 use OC\IntegrityCheck\Checker;
 use OC_App;
 use OC_Installer;
-use OC_Util;
 use OCP\IConfig;
 use OC\Setup;
 use OCP\ILogger;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class that handles autoupdating of ownCloud
@@ -56,9 +56,6 @@ class Updater extends BasicEmitter {
 	/** @var ILogger $log */
 	private $log;
 	
-	/** @var \OC\HTTPHelper $helper */
-	private $httpHelper;
-	
 	/** @var IConfig */
 	private $config;
 
@@ -83,16 +80,13 @@ class Updater extends BasicEmitter {
 	];
 
 	/**
-	 * @param HTTPHelper $httpHelper
 	 * @param IConfig $config
 	 * @param Checker $checker
 	 * @param ILogger $log
 	 */
-	public function __construct(HTTPHelper $httpHelper,
-								IConfig $config,
+	public function __construct(IConfig $config,
 								Checker $checker,
 								ILogger $log = null) {
-		$this->httpHelper = $httpHelper;
 		$this->log = $log;
 		$this->config = $config;
 		$this->checker = $checker;
@@ -132,63 +126,6 @@ class Updater extends BasicEmitter {
 	}
 
 	/**
-	 * Check if a new version is available
-	 *
-	 * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
-	 * @return array|bool
-	 */
-	public function check($updaterUrl = null) {
-
-		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
-			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
-		}
-
-		if (is_null($updaterUrl)) {
-			$updaterUrl = 'https://updates.owncloud.com/server/';
-		}
-
-		$this->config->setAppValue('core', 'lastupdatedat', time());
-
-		if ($this->config->getAppValue('core', 'installedat', '') === '') {
-			$this->config->setAppValue('core', 'installedat', microtime(true));
-		}
-
-		$version = \OCP\Util::getVersion();
-		$version['installed'] = $this->config->getAppValue('core', 'installedat');
-		$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
-		$version['updatechannel'] = \OC_Util::getChannel();
-		$version['edition'] = \OC_Util::getEditionString();
-		$version['build'] = \OC_Util::getBuild();
-		$versionString = implode('x', $version);
-
-		//fetch xml data from updater
-		$url = $updaterUrl . '?version=' . $versionString;
-
-		$tmp = [];
-		$xml = $this->httpHelper->getUrlContent($url);
-		if ($xml) {
-			$loadEntities = libxml_disable_entity_loader(true);
-			$data = @simplexml_load_string($xml);
-			libxml_disable_entity_loader($loadEntities);
-			if ($data !== false) {
-				$tmp['version'] = (string)$data->version;
-				$tmp['versionstring'] = (string)$data->versionstring;
-				$tmp['url'] = (string)$data->url;
-				$tmp['web'] = (string)$data->web;
-			} else {
-				libxml_clear_errors();
-			}
-		} else {
-			$data = [];
-		}
-
-		// Cache the result
-		$this->config->setAppValue('core', 'lastupdateResult', json_encode($data));
-		return $tmp;
-	}
-
-	/**
 	 * runs the update actions in maintenance mode, does not upgrade the source files
 	 * except the main .htaccess file
 	 *
@@ -425,6 +362,7 @@ class Updater extends BasicEmitter {
 	 * @throws NeedsUpdateException
 	 */
 	protected function doAppUpgrade() {
+		$this->emitRepairEvents();
 		$apps = \OC_App::getEnabledApps();
 		$priorityTypes = array('authentication', 'filesystem', 'logging');
 		$pseudoOtherType = 'other';
@@ -449,9 +387,9 @@ class Updater extends BasicEmitter {
 		foreach ($stacks as $type => $stack) {
 			foreach ($stack as $appId) {
 				if (\OC_App::shouldUpgrade($appId)) {
-					$this->emit('\OC\Updater', 'appUpgradeStarted', array($appId, \OC_App::getAppVersion($appId)));
+					$this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);
 					\OC_App::updateApp($appId);
-					$this->emit('\OC\Updater', 'appUpgrade', array($appId, \OC_App::getAppVersion($appId)));
+					$this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
 				}
 				if($type !== $pseudoOtherType) {
 					// load authentication, filesystem and logging apps after
@@ -537,5 +475,33 @@ class Updater extends BasicEmitter {
 			}
 		}
 	}
+
+	/**
+	 * Forward messages emitted by the repair routine
+	 */
+	private function emitRepairEvents() {
+		$dispatcher = \OC::$server->getEventDispatcher();
+		$dispatcher->addListener('\OC\Repair::warning', function ($event) {
+			if ($event instanceof GenericEvent) {
+				$this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
+			}
+		});
+		$dispatcher->addListener('\OC\Repair::error', function ($event) {
+			if ($event instanceof GenericEvent) {
+				$this->emit('\OC\Updater', 'repairError', $event->getArguments());
+			}
+		});
+		$dispatcher->addListener('\OC\Repair::info', function ($event) {
+			if ($event instanceof GenericEvent) {
+				$this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
+			}
+		});
+		$dispatcher->addListener('\OC\Repair::step', function ($event) {
+			if ($event instanceof GenericEvent) {
+				$this->emit('\OC\Updater', 'repairStep', $event->getArguments());
+			}
+		});
+	}
+
 }
 
diff --git a/lib/private/updater/versioncheck.php b/lib/private/updater/versioncheck.php
new file mode 100644
index 00000000000..e42a1e2a40c
--- /dev/null
+++ b/lib/private/updater/versioncheck.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <robin@mccorkell.me.uk>
+ * @author Steffen Lindner <mail@steffen-lindner.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Updater;
+
+use OC_Util;
+use OCP\Http\Client\IClientService;
+use OCP\IConfig;
+use OC\Setup;
+use OCP\Util;
+
+class VersionCheck {
+
+	/** @var IClientService */
+	private $clientService;
+	
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * @param IClientService $clientService
+	 * @param IConfig $config
+	 */
+	public function __construct(IClientService $clientService,
+								IConfig $config) {
+		$this->clientService = $clientService;
+		$this->config = $config;
+	}
+
+
+	/**
+	 * Check if a new version is available
+	 *
+	 * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
+	 * @return array|bool
+	 */
+	public function check($updaterUrl = null) {
+
+		// Look up the cache - it is invalidated all 30 minutes
+		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
+		}
+
+		if (is_null($updaterUrl)) {
+			$updaterUrl = 'https://updates.owncloud.com/server/';
+		}
+
+		$this->config->setAppValue('core', 'lastupdatedat', time());
+
+		if ($this->config->getAppValue('core', 'installedat', '') === '') {
+			$this->config->setAppValue('core', 'installedat', microtime(true));
+		}
+
+		$version = Util::getVersion();
+		$version['installed'] = $this->config->getAppValue('core', 'installedat');
+		$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
+		$version['updatechannel'] = \OC_Util::getChannel();
+		$version['edition'] = \OC_Util::getEditionString();
+		$version['build'] = \OC_Util::getBuild();
+		$versionString = implode('x', $version);
+
+		//fetch xml data from updater
+		$url = $updaterUrl . '?version=' . $versionString;
+
+		$tmp = [];
+		$xml = $this->getUrlContent($url);
+		if ($xml) {
+			$loadEntities = libxml_disable_entity_loader(true);
+			$data = @simplexml_load_string($xml);
+			libxml_disable_entity_loader($loadEntities);
+			if ($data !== false) {
+				$tmp['version'] = (string)$data->version;
+				$tmp['versionstring'] = (string)$data->versionstring;
+				$tmp['url'] = (string)$data->url;
+				$tmp['web'] = (string)$data->web;
+			} else {
+				libxml_clear_errors();
+			}
+		} else {
+			$data = [];
+		}
+
+		// Cache the result
+		$this->config->setAppValue('core', 'lastupdateResult', json_encode($data));
+		return $tmp;
+	}
+
+	/**
+	 * @codeCoverageIgnore
+	 * @param string $url
+	 * @return bool|resource|string
+	 */
+	protected function getUrlContent($url) {
+		try {
+			$client = $this->clientService->newClient();
+			$response = $client->get($url);
+			return $response->getBody();
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+}
+
diff --git a/lib/private/user.php b/lib/private/user.php
index 26062f503d2..11c35daa0de 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -203,6 +203,10 @@ class OC_User {
 				self::setUserId($uid);
 				self::setDisplayName($uid);
 				self::getUserSession()->setLoginName($uid);
+				// setup the filesystem
+				OC_Util::setupFS($uid);
+				//trigger creation of user home and /files folder
+				\OC::$server->getUserFolder($uid);
 
 				OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
 			}
@@ -268,15 +272,6 @@ class OC_User {
 	}
 
 	/**
-	 * Logs the current user out and kills all the session data
-	 *
-	 * Logout, destroys session
-	 */
-	public static function logout() {
-		self::getUserSession()->logout();
-	}
-
-	/**
 	 * Tries to login the user with HTTP Basic Authentication
 	 */
 	public static function tryBasicAuthLogin() {
@@ -342,7 +337,14 @@ class OC_User {
 			return $backend->getLogoutAttribute();
 		}
 
-		return 'href="' . link_to('', 'index.php') . '?logout=true&amp;requesttoken=' . urlencode(\OCP\Util::callRegister()) . '"';
+		$logoutUrl = \OC::$server->getURLGenerator()->linkToRouteAbsolute(
+			'core.login.logout',
+			[
+				'requesttoken' => \OCP\Util::callRegister(),
+			]
+		);
+
+		return 'href="'.$logoutUrl.'"';
 	}
 
 	/**
diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php
index c43011d3177..392c0471768 100644
--- a/lib/public/Share/IManager.php
+++ b/lib/public/Share/IManager.php
@@ -164,12 +164,22 @@ interface IManager {
 	 * The group with $gid is deleted
 	 * We need to clear up all shares to this group
 	 *
-	 * @param $gid
+	 * @param string $gid
 	 * @since 9.1.0
 	 */
 	public function groupDeleted($gid);
 
 	/**
+	 * The user $uid is deleted from the group $gid
+	 * All user specific group shares have to be removed
+	 *
+	 * @param string $uid
+	 * @param string $gid
+	 * @since 9.1.0
+	 */
+	public function userDeletedFromGroup($uid, $gid);
+
+	/**
 	 * Instantiates a new share object. This is to be passed to
 	 * createShare.
 	 *
diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php
index 24af36e0757..ac75a6f20b0 100644
--- a/lib/public/Share/IShareProvider.php
+++ b/lib/public/Share/IShareProvider.php
@@ -166,4 +166,15 @@ interface IShareProvider {
 	 * @since 9.1.0
 	 */
 	public function groupDeleted($gid);
+
+	/**
+	 * A user is deleted from a group
+	 * We have to clean up all the related user specific group shares
+	 * Providers not handling group shares should just return
+	 *
+	 * @param string $uid
+	 * @param string $gid
+	 * @since 9.1.0
+	 */
+	public function userDeletedFromGroup($uid, $gid);
 }
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index df30dd57cee..8d20a1ab57d 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -168,4 +168,16 @@ interface IEncryptionModule {
 	 */
 	public function prepareDecryptAll(InputInterface $input, OutputInterface $output, $user = '');
 
+	/**
+	 * Check if the module is ready to be used by that specific user.
+	 * In case a module is not ready - because e.g. key pairs have not been generated
+	 * upon login this method can return false before any operation starts and might
+	 * cause issues during operations.
+	 *
+	 * @param string $user
+	 * @return boolean
+	 * @since 9.1.0
+	 */
+	public function isReadyForUser($user);
+
 }
diff --git a/lib/public/files/mount/imountpoint.php b/lib/public/files/mount/imountpoint.php
index 9ce1396c1d1..bc7bf81709f 100644
--- a/lib/public/files/mount/imountpoint.php
+++ b/lib/public/files/mount/imountpoint.php
@@ -94,4 +94,12 @@ interface IMountPoint {
 	 * @since 8.1.0
 	 */
 	public function getOptions();
+
+	/**
+	 * Get the file id of the root of the storage
+	 *
+	 * @return int
+	 * @since 9.1.0
+	 */
+	public function getStorageRootId();
 }
diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php
index 6a4163875a9..fa947612fcd 100644
--- a/lib/public/ilogger.php
+++ b/lib/public/ilogger.php
@@ -135,10 +135,10 @@ interface ILogger {
 	 * ]);
 	 * </code>
 	 *
-	 * @param \Exception $exception
+	 * @param \Exception | \Throwable $exception
 	 * @param array $context
 	 * @return void
 	 * @since 8.2.0
 	 */
-	public function logException(\Exception $exception, array $context = array());
+	public function logException($exception, array $context = array());
 }
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
index a0040aa464d..296c70f4ecc 100644
--- a/lib/public/irequest.php
+++ b/lib/public/irequest.php
@@ -129,7 +129,7 @@ interface IRequest {
 	 * Shortcut for getting cookie variables
 	 *
 	 * @param string $key the key that will be taken from the $_COOKIE array
-	 * @return array the value in the $_COOKIE element
+	 * @return string the value in the $_COOKIE element
 	 * @since 6.0.0
 	 */
 	public function getCookie($key);
diff --git a/lib/public/user.php b/lib/public/user.php
index 825e77aef6d..64ac92d2100 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -119,7 +119,7 @@ class User {
 	 * @since 5.0.0
 	 */
 	public static function logout() {
-		\OC_User::logout();
+		\OC::$server->getUserSession()->logout();
 	}
 
 	/**